moving structure around + more work on builder...

diff --git a/Makefile b/Makefile
index 612f77fdf51d7903587cd96c0d8430df86dbbb71..337baf03fa012f9c17a547a62b84442d03efe396 100644 (file)
--- 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 8ed8745bb6eb363511d6e721bc40bf286f57abc9..dcf17dce9289aecfa2caa37fea2023cdc74fc9a2 100644 (file)
--- 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 c7d457d6e01e8c6a38e47655eca52881503a8f36..9d26b41c8d64de2977965e9359c37054a41cb927 100644 (file)
--- 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 846a935b869ba697cf5db14e2fe3b1fdccf7b04b..e7e5d16be90b78ccd04355066fbe246069edf9f5 100644 (file)
--- 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/js/application.js b/docs/assets/js/application.js
index 2315cdaa8702073dc5db51b5e21de6f02c6a6223..8c86ff0282882046c8f6a2f828ccbd871f59b91f 100644 (file)
--- 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 5b2b716d7eb11e2be0962776ed5f710c9661a5a7..99564576fce3d615cdb87f1469af8bb5a3cdb0cd 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -108,24 +108,24 @@
     <div class="span3">
       <h3>Components</h3>
       <label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="button-combo.less"> Combo buttons</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Combo buttons</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="page.less"> Pager</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="progres-bars.less"> Progress bars</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
     </div><!-- /span -->
     <div class="span3">
       <h3>JS Components</h3>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="tooltips.less"> Tooltips</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="popover.less"> Popovers</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="tabs.less"> Tabs</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="collapse.less"> Collapse</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Tabs</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Collapse</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
     </div><!-- /span -->
     <div class="span3">
@@ -135,9 +135,9 @@
       <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
       <h3>Responsive</h3>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-480.less"> Max-width 480px</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-768.less"> Max-width 768px</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-1210.less"> Max-width 1210px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label>
     </div><!-- /span -->
   </div><!-- /row -->
 </section>
@@ -154,68 +154,68 @@
     <div class="span4">
       <h3>Links</h3>
       <label>@linkColor</label>
-      <input type="text" class="span3" value="#08c">
+      <input type="text" class="span3" placeholder="#08c">
       <label>@linkColorHover</label>
-      <input type="text" class="span3" value="darken(@linkColor, 15%)">
+      <input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
       <h3>Grid system</h3>
       <label>@gridColumns</label>
-      <input type="text" class="span3" value="12">
+      <input type="text" class="span3" placeholder="12">
       <label>@gridColumnWidth</label>
-      <input type="text" class="span3" value="40px">
+      <input type="text" class="span3" placeholder="40px">
       <label>@gridGutterWidth</label>
-      <input type="text" class="span3" value="20px">
+      <input type="text" class="span3" placeholder="20px">
       <label>@siteWidth</label>
-      <input type="text" class="span3" value="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
+      <input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
       <label>@fluidSidebarWidth</label>
-      <input type="text" class="span3" value="220px">
+      <input type="text" class="span3" placeholder="220px">
     </div><!-- /span -->
     <div class="span4">
       <h3>Typography</h3>
       <label>@baseFontSize</label>
-      <input type="text" class="span3" value="13px">
+      <input type="text" class="span3" placeholder="13px">
       <label>@baseFontFamily</label>
-      <input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif">
+      <input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
       <label>@baseLineHeight</label>
-      <input type="text" class="span3" value="18px">
+      <input type="text" class="span3" placeholder="18px">
       <h3>Forms</h3>
       <label>@primaryButtonColor</label>
-      <input type="text" class="span3" value="@blue">
+      <input type="text" class="span3" placeholder="@blue">
       <label>@placeholderText</label>
-      <input type="text" class="span3" value="@grayLight">
+      <input type="text" class="span3" placeholder="@grayLight">
       <h3>Navbar</h3>
       <label>@navbarHeight</label>
-      <input type="text" class="span3" value="40px">
+      <input type="text" class="span3" placeholder="40px">
       <label>@navbarBackground</label>
-      <input type="text" class="span3" value="@grayDarker">
+      <input type="text" class="span3" placeholder="@grayDarker">
       <label>@navbarBackgroundHighlight</label>
-      <input type="text" class="span3" value="@grayDark">
+      <input type="text" class="span3" placeholder="@grayDark">
     </div><!-- /span -->
     <div class="span4">
       <h3>Form states &amp; alerts</h3>
       <label>@warningText</label>
-      <input type="text" class="span3" value="#c09853">
+      <input type="text" class="span3" placeholder="#c09853">
       <label>@warningBackground</label>
-      <input type="text" class="span3" value="#fcf8e3">
+      <input type="text" class="span3" placeholder="#fcf8e3">
       <label>@warningBorder</label>
-      <input type="text" class="span3" value="#f3edd2">
+      <input type="text" class="span3" placeholder="#f3edd2">
       <label>@errorText</label>
-      <input type="text" class="span3" value="#b94a48">
+      <input type="text" class="span3" placeholder="#b94a48">
       <label>@errorBackground</label>
-      <input type="text" class="span3" value="#f2dede">
+      <input type="text" class="span3" placeholder="#f2dede">
       <label>@errorBorder</label>
-      <input type="text" class="span3" value="#e9c7c7">
+      <input type="text" class="span3" placeholder="#e9c7c7">
       <label>@successText</label>
-      <input type="text" class="span3" value="#468847">
+      <input type="text" class="span3" placeholder="#468847">
       <label>@successBackground</label>
-      <input type="text" class="span3" value="#dff0d8">
+      <input type="text" class="span3" placeholder="#dff0d8">
       <label>@successBorder</label>
-      <input type="text" class="span3" value="#cfe8c4">
+      <input type="text" class="span3" placeholder="#cfe8c4">
       <label>@infoText</label>
-      <input type="text" class="span3" value="#3a87ad">
+      <input type="text" class="span3" placeholder="#3a87ad">
       <label>@infoBackground</label>
-      <input type="text" class="span3" value="#d9edf7">
+      <input type="text" class="span3" placeholder="#d9edf7">
       <label>@infoBorder</label>
-      <input type="text" class="span3" value="#bfe1f2">
+      <input type="text" class="span3" placeholder="#bfe1f2">
     </div><!-- /span -->
   </div><!-- /row -->
 </section>

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index df6ea9f008d4417ddca951aea232222f0f04187f..02b9721d3180305ba9158965682d2bfcf1517c17 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -381,6 +381,7 @@
   </div>
 </section>
 
+
      <!-- Footer
       ================================================== -->
       <footer class="footer">

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 4707e60a947cedef00c20618696977d1ddd065a5..0f997d368674d337117dc9d684535c04bd010512 100644 (file)
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -43,24 +43,24 @@
     <div class="span3">
       <h3>Components</h3>
       <label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="button-combo.less"> Combo buttons</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Combo buttons</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="page.less"> Pager</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="progres-bars.less"> Progress bars</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
     </div><!-- /span -->
     <div class="span3">
       <h3>JS Components</h3>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="tooltips.less"> Tooltips</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="popover.less"> Popovers</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="tabs.less"> Tabs</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="collapse.less"> Collapse</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Tabs</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Collapse</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
     </div><!-- /span -->
     <div class="span3">
@@ -70,9 +70,9 @@
       <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
       <h3>Responsive</h3>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-480.less"> Max-width 480px</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-768.less"> Max-width 768px</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-1210.less"> Max-width 1210px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label>
+      <label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label>
     </div><!-- /span -->
   </div><!-- /row -->
 </section>
@@ -89,68 +89,68 @@
     <div class="span4">
       <h3>Links</h3>
       <label>@linkColor</label>
-      <input type="text" class="span3" value="#08c">
+      <input type="text" class="span3" placeholder="#08c">
       <label>@linkColorHover</label>
-      <input type="text" class="span3" value="darken(@linkColor, 15%)">
+      <input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
       <h3>Grid system</h3>
       <label>@gridColumns</label>
-      <input type="text" class="span3" value="12">
+      <input type="text" class="span3" placeholder="12">
       <label>@gridColumnWidth</label>
-      <input type="text" class="span3" value="40px">
+      <input type="text" class="span3" placeholder="40px">
       <label>@gridGutterWidth</label>
-      <input type="text" class="span3" value="20px">
+      <input type="text" class="span3" placeholder="20px">
       <label>@siteWidth</label>
-      <input type="text" class="span3" value="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
+      <input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
       <label>@fluidSidebarWidth</label>
-      <input type="text" class="span3" value="220px">
+      <input type="text" class="span3" placeholder="220px">
     </div><!-- /span -->
     <div class="span4">
       <h3>Typography</h3>
       <label>@baseFontSize</label>
-      <input type="text" class="span3" value="13px">
+      <input type="text" class="span3" placeholder="13px">
       <label>@baseFontFamily</label>
-      <input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif">
+      <input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
       <label>@baseLineHeight</label>
-      <input type="text" class="span3" value="18px">
+      <input type="text" class="span3" placeholder="18px">
       <h3>Forms</h3>
       <label>@primaryButtonColor</label>
-      <input type="text" class="span3" value="@blue">
+      <input type="text" class="span3" placeholder="@blue">
       <label>@placeholderText</label>
-      <input type="text" class="span3" value="@grayLight">
+      <input type="text" class="span3" placeholder="@grayLight">
       <h3>Navbar</h3>
       <label>@navbarHeight</label>
-      <input type="text" class="span3" value="40px">
+      <input type="text" class="span3" placeholder="40px">
       <label>@navbarBackground</label>
-      <input type="text" class="span3" value="@grayDarker">
+      <input type="text" class="span3" placeholder="@grayDarker">
       <label>@navbarBackgroundHighlight</label>
-      <input type="text" class="span3" value="@grayDark">
+      <input type="text" class="span3" placeholder="@grayDark">
     </div><!-- /span -->
     <div class="span4">
       <h3>Form states &amp; alerts</h3>
       <label>@warningText</label>
-      <input type="text" class="span3" value="#c09853">
+      <input type="text" class="span3" placeholder="#c09853">
       <label>@warningBackground</label>
-      <input type="text" class="span3" value="#fcf8e3">
+      <input type="text" class="span3" placeholder="#fcf8e3">
       <label>@warningBorder</label>
-      <input type="text" class="span3" value="#f3edd2">
+      <input type="text" class="span3" placeholder="#f3edd2">
       <label>@errorText</label>
-      <input type="text" class="span3" value="#b94a48">
+      <input type="text" class="span3" placeholder="#b94a48">
       <label>@errorBackground</label>
-      <input type="text" class="span3" value="#f2dede">
+      <input type="text" class="span3" placeholder="#f2dede">
       <label>@errorBorder</label>
-      <input type="text" class="span3" value="#e9c7c7">
+      <input type="text" class="span3" placeholder="#e9c7c7">
       <label>@successText</label>
-      <input type="text" class="span3" value="#468847">
+      <input type="text" class="span3" placeholder="#468847">
       <label>@successBackground</label>
-      <input type="text" class="span3" value="#dff0d8">
+      <input type="text" class="span3" placeholder="#dff0d8">
       <label>@successBorder</label>
-      <input type="text" class="span3" value="#cfe8c4">
+      <input type="text" class="span3" placeholder="#cfe8c4">
       <label>@infoText</label>
-      <input type="text" class="span3" value="#3a87ad">
+      <input type="text" class="span3" placeholder="#3a87ad">
       <label>@infoBackground</label>
-      <input type="text" class="span3" value="#d9edf7">
+      <input type="text" class="span3" placeholder="#d9edf7">
       <label>@infoBorder</label>
-      <input type="text" class="span3" value="#bfe1f2">
+      <input type="text" class="span3" placeholder="#bfe1f2">
     </div><!-- /span -->
   </div><!-- /row -->
 </section>

diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/img/glyphicons-halflings-sprite-white.png
similarity index 100%
rename from docs/assets/img/glyphicons-halflings-sprite-white.png
rename to img/glyphicons-halflings-sprite-white.png

diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/img/glyphicons-halflings-sprite.png
similarity index 100%
rename from docs/assets/img/glyphicons-halflings-sprite.png
rename to img/glyphicons-halflings-sprite.png

diff --git a/lib/accordion.less b/less/accordion.less
similarity index 100%
rename from lib/accordion.less
rename to less/accordion.less

diff --git a/lib/alerts.less b/less/alerts.less
similarity index 100%
rename from lib/alerts.less
rename to less/alerts.less

diff --git a/lib/bootstrap.less b/less/bootstrap.less
similarity index 100%
rename from lib/bootstrap.less
rename to less/bootstrap.less

diff --git a/lib/breadcrumbs.less b/less/breadcrumbs.less
similarity index 100%
rename from lib/breadcrumbs.less
rename to less/breadcrumbs.less

diff --git a/lib/button-groups.less b/less/button-groups.less
similarity index 100%
rename from lib/button-groups.less
rename to less/button-groups.less

diff --git a/lib/buttons.less b/less/buttons.less
similarity index 100%
rename from lib/buttons.less
rename to less/buttons.less

diff --git a/lib/carousel.less b/less/carousel.less
similarity index 100%
rename from lib/carousel.less
rename to less/carousel.less

diff --git a/lib/close.less b/less/close.less
similarity index 100%
rename from lib/close.less
rename to less/close.less

diff --git a/lib/code.less b/less/code.less
similarity index 100%
rename from lib/code.less
rename to less/code.less

diff --git a/lib/component-animations.less b/less/component-animations.less
similarity index 100%
rename from lib/component-animations.less
rename to less/component-animations.less

diff --git a/lib/dropdowns.less b/less/dropdowns.less
similarity index 100%
rename from lib/dropdowns.less
rename to less/dropdowns.less

diff --git a/lib/forms.less b/less/forms.less
similarity index 100%
rename from lib/forms.less
rename to less/forms.less

diff --git a/lib/grid.less b/less/grid.less
similarity index 100%
rename from lib/grid.less
rename to less/grid.less

diff --git a/lib/hero-unit.less b/less/hero-unit.less
similarity index 100%
rename from lib/hero-unit.less
rename to less/hero-unit.less

diff --git a/lib/labels.less b/less/labels.less
similarity index 100%
rename from lib/labels.less
rename to less/labels.less

diff --git a/lib/layouts.less b/less/layouts.less
similarity index 100%
rename from lib/layouts.less
rename to less/layouts.less

diff --git a/lib/mixins.less b/less/mixins.less
similarity index 100%
rename from lib/mixins.less
rename to less/mixins.less

diff --git a/lib/modals.less b/less/modals.less
similarity index 100%
rename from lib/modals.less
rename to less/modals.less

diff --git a/lib/navbar.less b/less/navbar.less
similarity index 100%
rename from lib/navbar.less
rename to less/navbar.less

diff --git a/lib/navs.less b/less/navs.less
similarity index 100%
rename from lib/navs.less
rename to less/navs.less

diff --git a/lib/pager.less b/less/pager.less
similarity index 100%
rename from lib/pager.less
rename to less/pager.less

diff --git a/lib/pagination.less b/less/pagination.less
similarity index 100%
rename from lib/pagination.less
rename to less/pagination.less

diff --git a/lib/patterns.less b/less/patterns.less
similarity index 100%
rename from lib/patterns.less
rename to less/patterns.less

diff --git a/lib/popovers.less b/less/popovers.less
similarity index 100%
rename from lib/popovers.less
rename to less/popovers.less

diff --git a/lib/print.less b/less/print.less
similarity index 100%
rename from lib/print.less
rename to less/print.less

diff --git a/lib/progress-bars.less b/less/progress-bars.less
similarity index 100%
rename from lib/progress-bars.less
rename to less/progress-bars.less

diff --git a/lib/reset.less b/less/reset.less
similarity index 100%
rename from lib/reset.less
rename to less/reset.less

diff --git a/lib/responsive.less b/less/responsive.less
similarity index 100%
rename from lib/responsive.less
rename to less/responsive.less

diff --git a/lib/scaffolding.less b/less/scaffolding.less
similarity index 100%
rename from lib/scaffolding.less
rename to less/scaffolding.less

diff --git a/lib/sprites.less b/less/sprites.less
similarity index 97%
rename from lib/sprites.less
rename to less/sprites.less
index ef929528842621ae2d9f41c2fc4cf45ba3d2364e..c3b4206656768a39c704bb57c3d50e11e860b094 100644 (file)
--- a/lib/sprites.less
+++ b/less/sprites.less
@@ -12,7 +12,7 @@
 // will look like <i class="inbox"></i>.
 
 .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;
@@ -21,7 +21,7 @@
   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; }

diff --git a/lib/tables.less b/less/tables.less
similarity index 100%
rename from lib/tables.less
rename to less/tables.less

diff --git a/lib/thumbnails.less b/less/thumbnails.less
similarity index 100%
rename from lib/thumbnails.less
rename to less/thumbnails.less

diff --git a/lib/tooltip.less b/less/tooltip.less
similarity index 100%
rename from lib/tooltip.less
rename to less/tooltip.less

diff --git a/lib/type.less b/less/type.less
similarity index 100%
rename from lib/type.less
rename to less/type.less

diff --git a/lib/utilities.less b/less/utilities.less
similarity index 100%
rename from lib/utilities.less
rename to less/utilities.less

diff --git a/lib/variables.less b/less/variables.less
similarity index 100%
rename from lib/variables.less
rename to less/variables.less

diff --git a/lib/wells.less b/less/wells.less
similarity index 100%
rename from lib/wells.less
rename to less/wells.less