From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 21:48:46 -0800 Subject: moving structure around + more work on builder... --- Makefile | 6 +- bootstrap-responsive.min.css | 2 +- bootstrap.css | 8 +- bootstrap.min.css | 6 +- .../img/glyphicons-halflings-sprite-white.png | Bin 13566 -> 0 bytes docs/assets/img/glyphicons-halflings-sprite.png | Bin 14152 -> 0 bytes docs/assets/js/application.js | 16 +- docs/download.html | 74 +-- docs/scaffolding.html | 1 + docs/templates/pages/download.mustache | 74 +-- img/glyphicons-halflings-sprite-white.png | Bin 0 -> 13566 bytes img/glyphicons-halflings-sprite.png | Bin 0 -> 14152 bytes less/accordion.less | 30 ++ less/alerts.less | 69 +++ less/bootstrap.less | 63 +++ less/breadcrumbs.less | 22 + less/button-groups.less | 121 +++++ less/buttons.less | 151 ++++++ less/carousel.less | 114 +++++ less/close.less | 18 + less/code.less | 44 ++ less/component-animations.less | 18 + less/dropdowns.less | 110 +++++ less/forms.less | 514 +++++++++++++++++++++ less/grid.less | 41 ++ less/hero-unit.less | 20 + less/labels.less | 16 + less/layouts.less | 43 ++ less/mixins.less | 360 +++++++++++++++ less/modals.less | 65 +++ less/navbar.less | 251 ++++++++++ less/navs.less | 338 ++++++++++++++ less/pager.less | 25 + less/pagination.less | 54 +++ less/patterns.less | 13 + less/popovers.less | 49 ++ less/print.less | 18 + less/progress-bars.less | 99 ++++ less/reset.less | 126 +++++ less/responsive.less | 268 +++++++++++ less/scaffolding.less | 29 ++ less/sprites.less | 121 +++++ less/tables.less | 138 ++++++ less/thumbnails.less | 33 ++ less/tooltip.less | 35 ++ less/type.less | 206 +++++++++ less/utilities.less | 23 + less/variables.less | 90 ++++ less/wells.less | 17 + lib/accordion.less | 30 -- lib/alerts.less | 69 --- lib/bootstrap.less | 63 --- lib/breadcrumbs.less | 22 - lib/button-groups.less | 121 ----- lib/buttons.less | 151 ------ lib/carousel.less | 114 ----- lib/close.less | 18 - lib/code.less | 44 -- lib/component-animations.less | 18 - lib/dropdowns.less | 110 ----- lib/forms.less | 514 --------------------- lib/grid.less | 41 -- lib/hero-unit.less | 20 - lib/labels.less | 16 - lib/layouts.less | 43 -- lib/mixins.less | 360 --------------- lib/modals.less | 65 --- lib/navbar.less | 251 ---------- lib/navs.less | 338 -------------- lib/pager.less | 25 - lib/pagination.less | 54 --- lib/patterns.less | 13 - lib/popovers.less | 49 -- lib/print.less | 18 - lib/progress-bars.less | 99 ---- lib/reset.less | 126 ----- lib/responsive.less | 268 ----------- lib/scaffolding.less | 29 -- lib/sprites.less | 121 ----- lib/tables.less | 138 ------ lib/thumbnails.less | 33 -- lib/tooltip.less | 35 -- lib/type.less | 206 --------- lib/utilities.less | 23 - lib/variables.less | 90 ---- lib/wells.less | 17 - 86 files changed, 3850 insertions(+), 3841 deletions(-) delete mode 100644 docs/assets/img/glyphicons-halflings-sprite-white.png delete mode 100644 docs/assets/img/glyphicons-halflings-sprite.png create mode 100644 img/glyphicons-halflings-sprite-white.png create mode 100644 img/glyphicons-halflings-sprite.png create mode 100644 less/accordion.less create mode 100644 less/alerts.less create mode 100644 less/bootstrap.less create mode 100644 less/breadcrumbs.less create mode 100644 less/button-groups.less create mode 100644 less/buttons.less create mode 100644 less/carousel.less create mode 100644 less/close.less create mode 100644 less/code.less create mode 100644 less/component-animations.less create mode 100644 less/dropdowns.less create mode 100644 less/forms.less create mode 100644 less/grid.less create mode 100644 less/hero-unit.less create mode 100644 less/labels.less create mode 100644 less/layouts.less create mode 100644 less/mixins.less create mode 100644 less/modals.less create mode 100644 less/navbar.less create mode 100644 less/navs.less create mode 100644 less/pager.less create mode 100644 less/pagination.less create mode 100644 less/patterns.less create mode 100644 less/popovers.less create mode 100644 less/print.less create mode 100644 less/progress-bars.less create mode 100644 less/reset.less create mode 100644 less/responsive.less create mode 100644 less/scaffolding.less create mode 100644 less/sprites.less create mode 100644 less/tables.less create mode 100644 less/thumbnails.less create mode 100644 less/tooltip.less create mode 100644 less/type.less create mode 100644 less/utilities.less create mode 100644 less/variables.less create mode 100644 less/wells.less delete mode 100644 lib/accordion.less delete mode 100644 lib/alerts.less delete mode 100644 lib/bootstrap.less delete mode 100644 lib/breadcrumbs.less delete mode 100644 lib/button-groups.less delete mode 100644 lib/buttons.less delete mode 100644 lib/carousel.less delete mode 100644 lib/close.less delete mode 100644 lib/code.less delete mode 100644 lib/component-animations.less delete mode 100644 lib/dropdowns.less delete mode 100644 lib/forms.less delete mode 100644 lib/grid.less delete mode 100644 lib/hero-unit.less delete mode 100644 lib/labels.less delete mode 100644 lib/layouts.less delete mode 100644 lib/mixins.less delete mode 100644 lib/modals.less delete mode 100644 lib/navbar.less delete mode 100644 lib/navs.less delete mode 100644 lib/pager.less delete mode 100644 lib/pagination.less delete mode 100644 lib/patterns.less delete mode 100644 lib/popovers.less delete mode 100644 lib/print.less delete mode 100644 lib/progress-bars.less delete mode 100644 lib/reset.less delete mode 100644 lib/responsive.less delete mode 100644 lib/scaffolding.less delete mode 100644 lib/sprites.less delete mode 100644 lib/tables.less delete mode 100644 lib/thumbnails.less delete mode 100644 lib/tooltip.less delete mode 100644 lib/type.less delete mode 100644 lib/utilities.less delete mode 100644 lib/variables.less delete mode 100644 lib/wells.less diff --git a/Makefile b/Makefile index 612f77fdf..337baf03f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ VERSION=2.0.0 BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css -BOOTSTRAP_LESS = ./lib/bootstrap.less +BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css -BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less +BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less LESS_COMPRESSOR ?= `which lessc` UGLIFY_JS ?= `which uglifyjs` WATCHR ?= `which watchr` @@ -36,7 +36,7 @@ build: watch: @@if test ! -z ${WATCHR}; then \ echo "Watching less files..."; \ - watchr -e "watch('lib/.*\.less') { system 'make' }"; \ + watchr -e "watch('less/.*\.less') { system 'make' }"; \ else \ echo "You must have the watchr installed in order to watch Bootstrap Less files."; \ echo "You can install it by running: gem install watchr"; \ diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css index 8ed8745bb..dcf17dce9 100644 --- a/bootstrap-responsive.min.css +++ b/bootstrap-responsive.min.css @@ -1,3 +1,3 @@ .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}} +@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}} diff --git a/bootstrap.css b/bootstrap.css index c7d457d6e..9d26b41c8 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Jan 26 19:09:35 PST 2012 + * Date: Thu Jan 26 21:48:03 PST 2012 */ article, aside, @@ -1066,7 +1066,7 @@ table .span12 { margin-left: 0; } .icon { - background-image: url(docs/assets/img/glyphicons-halflings-sprite.png); + background-image: url(img/glyphicons-halflings-sprite.png); background-position: 0 0; background-repeat: no-repeat; display: inline-block; @@ -1075,7 +1075,7 @@ table .span12 { height: 14px; } .icon.white { - background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png); + background-image: url(img/glyphicons-halflings-sprite-white.png); } .icon.glass { background-position: 0 0; @@ -1831,7 +1831,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { diff --git a/bootstrap.min.css b/bootstrap.min.css index 846a935b8..e7e5d16be 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -207,8 +207,8 @@ table .span9{float:none;width:684px;margin-left:0;} table .span10{float:none;width:764px;margin-left:0;} table .span11{float:none;width:844px;margin-left:0;} table .span12{float:none;width:924px;margin-left:0;} -.icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;} -.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);} +.icon{background-image:url(img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;} +.icon.white{background-image:url(img/glyphicons-halflings-sprite-white.png);} .icon.glass{background-position:0 0;} .icon.music{background-position:-24px 0;} .icon.search{background-position:-48px 0;} @@ -378,7 +378,7 @@ table .span12{float:none;width:924px;margin-left:0;} .navbar .btn-group .btn{margin-top:0;} .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} -.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;} +.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-static{margin-bottom:18px;} diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png deleted file mode 100644 index a92b1913a..000000000 Binary files a/docs/assets/img/glyphicons-halflings-sprite-white.png and /dev/null differ diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png deleted file mode 100644 index b4e0acfbc..000000000 Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and /dev/null differ diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 2315cdaa8..8c86ff028 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -171,6 +171,7 @@ $(function () { var inputsComponent = $("#components.download input") , inputsPlugin = $("#plugins.download input") + , inputsVariables = $("#variables.download input") // toggle all plugin checkboxes $('#components.download .toggle-all').on('click', function (e) { @@ -183,6 +184,11 @@ $(function () { inputsPlugin.attr('checked', !inputsPlugin.is(':checked')) }) + $('#variables.download .toggle-all').on('click', function (e) { + e.preventDefault() + inputsVariables.val('') + }) + // request built javascript $('.download-btn').on('click', function () { @@ -193,11 +199,12 @@ $(function () { .map(function () { return this.value }) .toArray() , vars = {} + , img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png'] - $("#variables.download input") - .each(function () { - return vars[ $(this).prev().text() ] = $(this).val() - }) + $("#variables.download input") + .each(function () { + $(this).val() && (vars[ $(this).prev().text() ] = $(this).val()) + }) // , url: "http://bootstrap.herokuapp.com" $.ajax({ @@ -209,6 +216,7 @@ $(function () { , js: js , css: css , vars: vars + , img: img } }) }) diff --git a/docs/download.html b/docs/download.html index 5b2b716d7..99564576f 100644 --- a/docs/download.html +++ b/docs/download.html @@ -108,24 +108,24 @@

Components

- + - + - +

JS Components

- - + + - - + +
@@ -135,9 +135,9 @@

Responsive

- - - + + +
@@ -154,68 +154,68 @@

Links

- + - +

Grid system

- + - + - + - + - +

Typography

- + - + - +

Forms

- + - +

Navbar

- + - + - +

Form states & alerts

- + - + - + - + - + - + - + - + - + - + - + - +
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index df6ea9f00..02b9721d3 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -381,6 +381,7 @@ +