moving structure around + more work on builder...

6 files changed, 87 insertions, 78 deletions

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
--- a/docs/assets/img/glyphicons-halflings-sprite-white.png
+++ /dev/null
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
--- a/docs/assets/img/glyphicons-halflings-sprite.png
+++ /dev/null
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 @@
     <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 df6ea9f00..02b9721d3 100644
--- 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 4707e60a9..0f997d368 100644
--- 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>