From: fat <jacobthornton@gmail.com>
Date: Thu, 16 May 2013 18:08:46 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c16155a21c7bcad9b1d52e2141425cdb7df494;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
---

a4c16155a21c7bcad9b1d52e2141425cdb7df494
diff --cc docs/customize.html
index 20020a31cc,5d4edcf79d..32a00b441e
--- a/docs/customize.html
+++ b/docs/customize.html
@@@ -13,346 -13,342 +13,342 @@@ slug: customiz
    </ul>
  </div>
  
-   <div class="container bs-docs-container">
  
-         <!-- Customize form
-         ================================================== -->
-         <form>
-           <section class="download" id="components">
-             <div class="page-header">
-               <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
-               <h1>
-                 1. Choose components
-               </h1>
-             </div>
-             <div class="row download-builder">
-               <div class="col-span-3">
-                 <h3>Scaffolding</h3>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> Normalize and reset</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="print.less"> Print</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="scaffolding.less"> Body type and links</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> Grid system</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> Layouts</label>
-                 <h3>Base CSS</h3>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label>
-               </div><!-- /span -->
-               <div class="col-span-3">
-                 <h3>Components</h3>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</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="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="progress-bars.less"> Progress bars</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label>
-                 <h3>JS Components</h3>
-                 <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="accordion.less"> Collapse</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
-               </div><!-- /span -->
-               <div class="col-span-3">
-                 <h3>Miscellaneous</h3>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
-                 <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="responsive-utilities.less"> Visible/hidden classes</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-767px-max.less"> Narrow tablets and below (<767px)</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-768px-979px.less"> Tablets to desktops (767-979px)</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-1200px-min.less"> Large desktops (>1200px)</label>
-                 <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-navbar.less"> Responsive navbar</label>
-               </div><!-- /span -->
-             </div><!-- /row -->
-           </section>
+ <!-- Customize form
+ ================================================== -->
+ <form>
+   <section class="download" id="components">
+     <div class="page-header">
+       <a class="btn btn-default btn-small pull-right toggle-all" href="#">Toggle all</a>
+       <h1>
+         1. Choose components
+       </h1>
+     </div>
+     <div class="row download-builder">
+       <div class="col-span-3">
+         <h3>Scaffolding</h3>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> Normalize and reset</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="print.less"> Print</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="scaffolding.less"> Body type and links</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> Grid system</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> Layouts</label>
+         <h3>Base CSS</h3>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label>
+       </div><!-- /span -->
+       <div class="col-span-3">
+         <h3>Components</h3>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</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="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="progress-bars.less"> Progress bars</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label>
+         <h3>JS Components</h3>
+         <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="accordion.less"> Collapse</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
+       </div><!-- /span -->
+       <div class="col-span-3">
+         <h3>Miscellaneous</h3>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
+         <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="responsive-utilities.less"> Visible/hidden classes</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-767px-max.less"> Narrow tablets and below (<767px)</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-768px-979px.less"> Tablets to desktops (767-979px)</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-1200px-min.less"> Large desktops (>1200px)</label>
+         <label class="checkbox"><input checked="checked" type="checkbox" value="responsive-navbar.less"> Responsive navbar</label>
+       </div><!-- /span -->
+     </div><!-- /row -->
+   </section>
  
-           <section class="download" id="plugins">
-             <div class="page-header">
-               <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
-               <h1>
-                 2. Select jQuery plugins
-               </h1>
-             </div>
-             <div class="row download-builder">
-               <div class="col-span-3">
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="transition.js">
-                   Transitions <small>(required for any animation)</small>
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="modal.js">
-                   Modals
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="dropdown.js">
-                   Dropdowns
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="scrollspy.js">
-                   Scrollspy
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="tab.js">
-                   Togglable tabs
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="tooltip.js">
-                   Tooltips
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="popover.js">
-                   Popovers <small>(requires Tooltips)</small>
-                 </label>
-               </div><!-- /span -->
-               <div class="col-span-3">
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="affix.js">
-                   Affix
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="alert.js">
-                   Alert messages
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="button.js">
-                   Buttons
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="collapse.js">
-                   Collapse
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="carousel.js">
-                   Carousel
-                 </label>
-                 <label class="checkbox">
-                   <input type="checkbox" checked="true" value="typeahead.js">
-                   Typeahead
-                 </label>
-               </div><!-- /span -->
-               <div class="col-span-3">
-                 <h4 class="muted">Heads up!</h4>
-                 <p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
-               </div><!-- /span -->
-             </div><!-- /row -->
-           </section>
+   <section class="download" id="plugins">
+     <div class="page-header">
+       <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
+       <h1>
+         2. Select jQuery plugins
+       </h1>
+     </div>
+     <div class="row download-builder">
+       <div class="col-span-3">
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-transition.js">
++          <input type="checkbox" checked="true" value="transition.js">
+           Transitions <small>(required for any animation)</small>
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-modal.js">
++          <input type="checkbox" checked="true" value="modal.js">
+           Modals
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-dropdown.js">
++          <input type="checkbox" checked="true" value="dropdown.js">
+           Dropdowns
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-scrollspy.js">
++          <input type="checkbox" checked="true" value="scrollspy.js">
+           Scrollspy
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-tab.js">
++          <input type="checkbox" checked="true" value="tab.js">
+           Togglable tabs
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-tooltip.js">
++          <input type="checkbox" checked="true" value="tooltip.js">
+           Tooltips
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-popover.js">
++          <input type="checkbox" checked="true" value="popover.js">
+           Popovers <small>(requires Tooltips)</small>
+         </label>
+       </div><!-- /span -->
+       <div class="col-span-3">
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-affix.js">
++          <input type="checkbox" checked="true" value="affix.js">
+           Affix
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-alert.js">
++          <input type="checkbox" checked="true" value="alert.js">
+           Alert messages
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-button.js">
++          <input type="checkbox" checked="true" value="button.js">
+           Buttons
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-collapse.js">
++          <input type="checkbox" checked="true" value="collapse.js">
+           Collapse
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-carousel.js">
++          <input type="checkbox" checked="true" value="carousel.js">
+           Carousel
+         </label>
+         <label class="checkbox">
 -          <input type="checkbox" checked="true" value="bootstrap-typeahead.js">
++          <input type="checkbox" checked="true" value="typeahead.js">
+           Typeahead
+         </label>
+       </div><!-- /span -->
+       <div class="col-span-3">
+         <h4 class="muted">Heads up!</h4>
+         <p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
+       </div><!-- /span -->
+     </div><!-- /row -->
+   </section>
  
  
-           <section class="download" id="variables">
-             <div class="page-header">
-               <a class="btn btn-small pull-right toggle-all" href="#">Reset to defaults</a>
-               <h1>
-                 3. Customize variables
-               </h1>
-             </div>
-             <div class="row download-builder">
-               <div class="col-span-3">
-                 <h3>Scaffolding</h3>
-                 <label>@body-background</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@text-color</label>
-                 <input type="text" placeholder="@grayDark">
+   <section class="download" id="variables">
+     <div class="page-header">
+       <a class="btn btn-small pull-right toggle-all" href="#">Reset to defaults</a>
+       <h1>
+         3. Customize variables
+       </h1>
+     </div>
+     <div class="row download-builder">
+       <div class="col-span-3">
+         <h3>Scaffolding</h3>
+         <label>@body-background</label>
+         <input type="text" placeholder="#fff">
+         <label>@text-color</label>
+         <input type="text" placeholder="@grayDark">
  
-                 <h3>Links</h3>
-                 <label>@link-color</label>
-                 <input type="text" placeholder="#08c">
-                 <label>@link-color-hover</label>
-                 <input type="text" placeholder="darken(@link-color, 15%)">
+         <h3>Links</h3>
+         <label>@link-color</label>
+         <input type="text" placeholder="#08c">
+         <label>@link-color-hover</label>
+         <input type="text" placeholder="darken(@link-color, 15%)">
  
-                 <h3>Grid system</h3>
-                 <label>@grid-columns</label>
-                 <input type="text" placeholder="12">
-                 <label>@grid-column-width</label>
-                 <input type="text" placeholder="60px">
-                 <label>@grid-gutter-width</label>
-                 <input type="text" placeholder="20px">
-                 <label>@grid-column-width-1200</label>
-                 <input type="text" placeholder="70px">
-                 <label>@grid-gutter-width-1200</label>
-                 <input type="text" placeholder="30px">
-                 <label>@grid-column-width-768</label>
-                 <input type="text" placeholder="42px">
-                 <label>@grid-gutter-width-768</label>
-                 <input type="text" placeholder="20px">
+         <h3>Grid system</h3>
+         <label>@grid-columns</label>
+         <input type="text" placeholder="12">
+         <label>@grid-column-width</label>
+         <input type="text" placeholder="60px">
+         <label>@grid-gutter-width</label>
+         <input type="text" placeholder="20px">
+         <label>@grid-column-width-1200</label>
+         <input type="text" placeholder="70px">
+         <label>@grid-gutter-width-1200</label>
+         <input type="text" placeholder="30px">
+         <label>@grid-column-width-768</label>
+         <input type="text" placeholder="42px">
+         <label>@grid-gutter-width-768</label>
+         <input type="text" placeholder="20px">
  
-               </div><!-- /span -->
-               <div class="col-span-3">
+       </div><!-- /span -->
+       <div class="col-span-3">
  
-                 <h3>Typography</h3>
-                 <label>@font-family-sans-serif</label>
-                 <input type="text" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
-                 <label>@font-family-serif</label>
-                 <input type="text" placeholder="Georgia, 'Times New Roman', Times, serif">
-                 <label>@font-family-monospace</label>
-                 <input type="text" placeholder="Menlo, Monaco, 'Courier New', monospace">
+         <h3>Typography</h3>
+         <label>@font-family-sans-serif</label>
+         <input type="text" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
+         <label>@font-family-serif</label>
+         <input type="text" placeholder="Georgia, 'Times New Roman', Times, serif">
+         <label>@font-family-monospace</label>
+         <input type="text" placeholder="Menlo, Monaco, 'Courier New', monospace">
  
-                 <label>@font-size-base</label>
-                 <input type="text" placeholder="14px">
-                 <label>@font-family-base</label>
-                 <input type="text" placeholder="@font-family-sans-serif">
-                 <label>@line-height-base</label>
-                 <input type="text" placeholder="20px">
+         <label>@font-size-base</label>
+         <input type="text" placeholder="14px">
+         <label>@font-family-base</label>
+         <input type="text" placeholder="@font-family-sans-serif">
+         <label>@line-height-base</label>
+         <input type="text" placeholder="20px">
  
-                 <label>@headings-font-family</label>
-                 <input type="text" placeholder="inherit">
-                 <label>@headings-font-weight</label>
-                 <input type="text" placeholder="bold">
-                 <label>@headingsColor</label>
-                 <input type="text" placeholder="inherit">
+         <label>@headings-font-family</label>
+         <input type="text" placeholder="inherit">
+         <label>@headings-font-weight</label>
+         <input type="text" placeholder="bold">
+         <label>@headingsColor</label>
+         <input type="text" placeholder="inherit">
  
-                 <label>@font-size-large</label>
-                 <input type="text" placeholder="@font-size-base * 1.25">
-                 <label>@font-size-small</label>
-                 <input type="text" placeholder="@font-size-base * 0.85">
-                 <label>@font-size-mini</label>
-                 <input type="text" placeholder="@font-size-base * 0.75">
+         <label>@font-size-large</label>
+         <input type="text" placeholder="@font-size-base * 1.25">
+         <label>@font-size-small</label>
+         <input type="text" placeholder="@font-size-base * 0.85">
+         <label>@font-size-mini</label>
+         <input type="text" placeholder="@font-size-base * 0.75">
  
-                 <label>@padding-large</label>
-                 <input type="text" placeholder="11px 19px">
-                 <label>@padding-small</label>
-                 <input type="text" placeholder="2px 10px">
-                 <label>@padding-mini</label>
-                 <input type="text" placeholder="1px 6px">
+         <label>@padding-large</label>
+         <input type="text" placeholder="11px 19px">
+         <label>@padding-small</label>
+         <input type="text" placeholder="2px 10px">
+         <label>@padding-mini</label>
+         <input type="text" placeholder="1px 6px">
  
-                 <label>@border-radius-base</label>
-                 <input type="text" placeholder="4px">
-                 <label>@border-radius-large</label>
-                 <input type="text" placeholder="6px">
-                 <label>@border-radius-small</label>
-                 <input type="text" placeholder="3px">
+         <label>@border-radius-base</label>
+         <input type="text" placeholder="4px">
+         <label>@border-radius-large</label>
+         <input type="text" placeholder="6px">
+         <label>@border-radius-small</label>
+         <input type="text" placeholder="3px">
  
-                 <label>@hero-background</label>
-                 <input type="text" placeholder="@grayLighter">
-                 <label>@hero-heading-color</label>
-                 <input type="text" placeholder="inherit">
-                 <label>@hero-lead-color</label>
-                 <input type="text" placeholder="inherit">
+         <label>@hero-background</label>
+         <input type="text" placeholder="@grayLighter">
+         <label>@hero-heading-color</label>
+         <input type="text" placeholder="inherit">
+         <label>@hero-lead-color</label>
+         <input type="text" placeholder="inherit">
  
-                 <h3>Tables</h3>
-                 <label>@table-background</label>
-                 <input type="text" placeholder="transparent">
-                 <label>@table-background-accent</label>
-                 <input type="text" placeholder="#f9f9f9">
-                 <label>@table-background-hover</label>
-                 <input type="text" placeholder="#f5f5f5">
-                 <label>@table-border-color</label>
-                 <input type="text" placeholder="#ddd">
+         <h3>Tables</h3>
+         <label>@table-background</label>
+         <input type="text" placeholder="transparent">
+         <label>@table-background-accent</label>
+         <input type="text" placeholder="#f9f9f9">
+         <label>@table-background-hover</label>
+         <input type="text" placeholder="#f5f5f5">
+         <label>@table-border-color</label>
+         <input type="text" placeholder="#ddd">
  
-                 <h3>Forms</h3>
-                 <label>@input-color-placeholder</label>
-                 <input type="text" placeholder="@grayLight">
-                 <label>@input-background</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@input-border</label>
-                 <input type="text" placeholder="#ccc">
-                 <label>@input-border-radius</label>
-                 <input type="text" placeholder="3px">
-                 <label>@input-background-disabled</label>
-                 <input type="text" placeholder="@grayLighter">
-                 <label>@form-actions-background</label>
-                 <input type="text" placeholder="#f5f5f5">
-                 <label>@btn-backround-primary</label>
-                 <input type="text" placeholder="@link-color">
-                 <label>@btn-backround-primary-highlight</label>
-                 <input type="text" placeholder="darken(#fff, 10%)">
+         <h3>Forms</h3>
+         <label>@input-color-placeholder</label>
+         <input type="text" placeholder="@grayLight">
+         <label>@input-background</label>
+         <input type="text" placeholder="#fff">
+         <label>@input-border</label>
+         <input type="text" placeholder="#ccc">
+         <label>@input-border-radius</label>
+         <input type="text" placeholder="3px">
+         <label>@input-background-disabled</label>
+         <input type="text" placeholder="@grayLighter">
+         <label>@form-actions-background</label>
+         <input type="text" placeholder="#f5f5f5">
+         <label>@btn-backround-primary</label>
+         <input type="text" placeholder="@link-color">
+         <label>@btn-backround-primary-highlight</label>
+         <input type="text" placeholder="darken(#fff, 10%)">
  
-               </div><!-- /span -->
-               <div class="col-span-3">
+       </div><!-- /span -->
+       <div class="col-span-3">
  
-                 <h3>Form states &amp; alerts</h3>
-                 <label>@state-warning-text</label>
-                 <input type="text" placeholder="#c09853">
-                 <label>@state-warning-background</label>
-                 <input type="text" placeholder="#fcf8e3">
-                 <label>@state-error-text</label>
-                 <input type="text" placeholder="#b94a48">
-                 <label>@state-error-background</label>
-                 <input type="text" placeholder="#f2dede">
-                 <label>@state-success-text</label>
-                 <input type="text" placeholder="#468847">
-                 <label>@state-success-background</label>
-                 <input type="text" placeholder="#dff0d8">
-                 <label>@state-info-text</label>
-                 <input type="text" placeholder="#3a87ad">
-                 <label>@state-info-background</label>
-                 <input type="text" placeholder="#d9edf7">
+         <h3>Form states &amp; alerts</h3>
+         <label>@state-warning-text</label>
+         <input type="text" placeholder="#c09853">
+         <label>@state-warning-background</label>
+         <input type="text" placeholder="#fcf8e3">
+         <label>@state-error-text</label>
+         <input type="text" placeholder="#b94a48">
+         <label>@state-error-background</label>
+         <input type="text" placeholder="#f2dede">
+         <label>@state-success-text</label>
+         <input type="text" placeholder="#468847">
+         <label>@state-success-background</label>
+         <input type="text" placeholder="#dff0d8">
+         <label>@state-info-text</label>
+         <input type="text" placeholder="#3a87ad">
+         <label>@state-info-background</label>
+         <input type="text" placeholder="#d9edf7">
  
-                 <h3>Navbar</h3>
-                 <label>@navbar-height</label>
-                 <input type="text" placeholder="40px">
-                 <label>@navbar-background</label>
-                 <input type="text" placeholder="@grayDarker">
-                 <label>@navbar-background-highlight</label>
-                 <input type="text" placeholder="@grayDark">
-                 <label>@navbar-color</label>
-                 <input type="text" placeholder="@grayLight">
-                 <label>@navbar-brand-color</label>
-                 <input type="text" placeholder="@navbar-link-color">
-                 <label>@navbar-link-color</label>
-                 <input type="text" placeholder="@grayLight">
-                 <label>@navbar-link-color-hover</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@navbar-link-color-active</label>
-                 <input type="text" placeholder="@navbar-link-color-hover">
-                 <label>@navbar-link-background-hover</label>
-                 <input type="text" placeholder="transparent">
-                 <label>@navbar-link-background-active</label>
-                 <input type="text" placeholder="@navbar-background">
-                 <label>@navbarSearchBackground</label>
-                 <input type="text" placeholder="lighten(@navbar-background, 25%)">
-                 <label>@navbarSearchBackgroundFocus</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@navbarSearchBorder</label>
-                 <input type="text" placeholder="darken(@navbarSearchBackground, 30%)">
-                 <label>@navbarSearchPlaceholderColor</label>
-                 <input type="text" placeholder="#ccc">
+         <h3>Navbar</h3>
+         <label>@navbar-height</label>
+         <input type="text" placeholder="40px">
+         <label>@navbar-background</label>
+         <input type="text" placeholder="@grayDarker">
+         <label>@navbar-background-highlight</label>
+         <input type="text" placeholder="@grayDark">
+         <label>@navbar-color</label>
+         <input type="text" placeholder="@grayLight">
+         <label>@navbar-brand-color</label>
+         <input type="text" placeholder="@navbar-link-color">
+         <label>@navbar-link-color</label>
+         <input type="text" placeholder="@grayLight">
+         <label>@navbar-link-color-hover</label>
+         <input type="text" placeholder="#fff">
+         <label>@navbar-link-color-active</label>
+         <input type="text" placeholder="@navbar-link-color-hover">
+         <label>@navbar-link-background-hover</label>
+         <input type="text" placeholder="transparent">
+         <label>@navbar-link-background-active</label>
+         <input type="text" placeholder="@navbar-background">
+         <label>@navbarSearchBackground</label>
+         <input type="text" placeholder="lighten(@navbar-background, 25%)">
+         <label>@navbarSearchBackgroundFocus</label>
+         <input type="text" placeholder="#fff">
+         <label>@navbarSearchBorder</label>
+         <input type="text" placeholder="darken(@navbarSearchBackground, 30%)">
+         <label>@navbarSearchPlaceholderColor</label>
+         <input type="text" placeholder="#ccc">
  
-                 <label>@navbar-collapse-width</label>
-                 <input type="text" placeholder="979px">
-                 <label>@navbar-collapse-width-desktop</label>
-                 <input type="text" placeholder="@navbar-collapse-width + 1">
+         <label>@navbar-collapse-width</label>
+         <input type="text" placeholder="979px">
+         <label>@navbar-collapse-width-desktop</label>
+         <input type="text" placeholder="@navbar-collapse-width + 1">
  
-                 <h3>Dropdowns</h3>
-                 <label>@dropdown-background</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@dropdown-border</label>
-                 <input type="text" placeholder="rgba(0,0,0,.2)">
-                 <label>@dropdown-link-color</label>
-                 <input type="text" placeholder="@grayDark">
-                 <label>@dropdown-link-color-hover</label>
-                 <input type="text" placeholder="#fff">
-                 <label>@dropdown-link-background-hover</label>
-                 <input type="text" placeholder="@link-color">
-               </div><!-- /span -->
-             </div><!-- /row -->
-           </section>
+         <h3>Dropdowns</h3>
+         <label>@dropdown-background</label>
+         <input type="text" placeholder="#fff">
+         <label>@dropdown-border</label>
+         <input type="text" placeholder="rgba(0,0,0,.2)">
+         <label>@dropdown-link-color</label>
+         <input type="text" placeholder="@grayDark">
+         <label>@dropdown-link-color-hover</label>
+         <input type="text" placeholder="#fff">
+         <label>@dropdown-link-background-hover</label>
+         <input type="text" placeholder="@link-color">
+       </div><!-- /span -->
+     </div><!-- /row -->
+   </section>
  
-           <section class="download" id="download">
-             <div class="page-header">
-               <h1>
-                 4. Download
-               </h1>
-             </div>
-             <div class="download-btn">
-               <a class="btn btn-primary" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
-               <h4>What's included?</h4>
-               <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
-             </div>
-           </section><!-- /download -->
-         </form>
- 
- 
-   </div><!-- /.container -->
+   <section class="download" id="download">
+     <div class="page-header">
+       <h1>
+         4. Download
+       </h1>
+     </div>
+     <div class="download-btn">
+       <a class="btn btn-primary" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
+       <h4>What's included?</h4>
+       <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
+     </div>
+   </section><!-- /download -->
+ </form>