Merge branch '2.0.3-wip'

Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js

1 files changed, 305 insertions, 42 deletions

diff --git a/docs/less.html b/docs/less.html
index f8e4d9b33..3fecd1ade 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -20,6 +20,7 @@
 
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="assets/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
@@ -39,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
@@ -139,12 +140,24 @@
 
   <div class="row">
     <div class="span6">
-      <h3>Hyperlinks</h3>
+      <h3>Scaffolding and links</h3>
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
-            <td class="span2"><code>@linkColor</code></td>
-            <td>#08c</td>
+            <td class="span2"><code>@bodyBackground</code></td>
+            <td><code>@white</code></td>
+            <td>Page background color</td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@textColor</code></td>
+            <td><code>@grayDark</code></td>
+            <td>Default text color for entire body, headings, and more</td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #333;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@linkColor</code></td>
+            <td><code>#08c</code></td>
             <td>Default link text color</td>
             <td class="swatch-col"><span class="swatch" style="background-color: #08c;"></span></td>
           </tr>
@@ -185,16 +198,69 @@
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
+            <td class="span2"><code>@sansFontFamily</code></td>
+            <td colspan="2">"Helvetica Neue", Helvetica, Arial, sans-serif</td>
+          </tr>
+          <tr>
+            <td><code>@serifFontFamily</code></td>
+            <td colspan="2"><code>Georgia, "Times New Roman", Times, serif</code></td>
+          </tr>
+          <tr>
+            <td><code>@monoFontFamily</code></td>
+            <td colspan="2">Menlo, Monaco, "Courier New", monospace</td>
+          </tr>
+
+          <tr>
             <td class="span2"><code>@baseFontSize</code></td>
             <td>13px</td>
+            <td><em class="muted">Must be pixels</em></td>
           </tr>
           <tr>
             <td><code>@baseFontFamily</code></td>
-            <td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td>
+            <td colspan="2"><code>@sansFontFamily</code></td>
           </tr>
           <tr>
             <td><code>@baseLineHeight</code></td>
             <td>18px</td>
+            <td><em class="muted">Must be pixels</em></td>
+          </tr>
+          <tr>
+            <td><code>@altFontFamily</code></td>
+            <td colspan="2"><code>@serifFontFamily</code></td>
+          </tr>
+
+          <tr>
+            <td class="span2"><code>@headingsFontFamily</code></td>
+            <td colspan="2"><code>inherit</code></td>
+          </tr>
+          <tr>
+            <td><code>@headingsFontWeight</code></td>
+            <td colspan="2"><code>bold</code></td>
+          </tr>
+          <tr>
+            <td><code>@headingsColor</code></td>
+            <td colspan="2"><code>inherit</code></td>
+          </tr>
+        </tbody>
+      </table>
+      <h3>Tables</h3>
+      <table class="table table-bordered table-striped">
+        <tbody>
+          <tr>
+            <td class="span2"><code>@tableBackground</code></td>
+            <td><code>transparent</code></td>
+          </tr>
+          <tr>
+            <td><code>@tableBackgroundAccent</code></td>
+            <td><code>#f9f9f9</code></td>
+          </tr>
+          <tr>
+            <td><code>@tableBackgroundHover</code></td>
+            <td><code>#f5f5f5</code></td>
+          </tr>
+          <tr>
+            <td><code>@tableBorder</code></td>
+            <td><code>ddd</code></td>
           </tr>
         </tbody>
       </table>
@@ -290,10 +356,86 @@
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
-            <td class="span3"><code>@primaryButtonBackground</code></td>
+            <td class="span3"><code>@btnBackground</code></td>
+            <td><code>@white</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #fff;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnBackgroundHighlight</code></td>
+            <td><code>darken(@white, 10%)</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #e6e6e6;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnBorder</code></td>
+            <td><code>darken(@white, 20%)</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #ccc;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnPrimaryBackground</code></td>
             <td><code>@linkColor</code></td>
             <td class="swatch-col"><span class="swatch" style="background-color: #08c;"></span></td>
           </tr>
+          <tr>
+            <td class="span3"><code>@btnPrimaryBackgroundHighlight</code></td>
+            <td><code>spin(@btnPrimaryBackground, 15%)</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #05c;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnInfoBackground</code></td>
+            <td><code>#5bc0de</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #5bc0de;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnInfoBackgroundHighlight</code></td>
+            <td><code>#2f96b4</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #2f96b4;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnSuccessBackground</code></td>
+            <td><code>#62c462</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #62c462;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnSuccessBackgroundHighlight</code></td>
+            <td><code>51a351</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #51a351;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnWarningBackground</code></td>
+            <td><code>lighten(@orange, 15%)</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #fbb450;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnWarningBackgroundHighlight</code></td>
+            <td><code>@orange</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #f89406;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnDangerBackground</code></td>
+            <td><code>#ee5f5b</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #ee5f5b;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnDangerBackgroundHighlight</code></td>
+            <td><code>#bd362f</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #bd362f;"></span></td>
+          </tr>
+
+          <tr>
+            <td class="span3"><code>@btnInverseBackground</code></td>
+            <td><code>@gray</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #555;"></span></td>
+          </tr>
+          <tr>
+            <td class="span3"><code>@btnInverseBackgroundHighlight</code></td>
+            <td><code>@grayDarker</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #222;"></span></td>
+          </tr>
         </tbody>
       </table>
       <h4>Forms</h4>
@@ -302,47 +444,29 @@
           <tr>
             <td class="span3"><code>@placeholderText</code></td>
             <td><code>@grayLight</code></td>
-            <td class="swatch-col"><span class="swatch" style="background-color: #999;"></span></td>
-          </tr>
-        </tbody>
-      </table>
-      <h4>Navbar</h4>
-      <table class="table table-bordered table-striped">
-        <tbody>
-          <tr>
-            <td class="span3"><code>@navbarHeight</code></td>
-            <td>40px</td>
-            <td class="swatch-col"></td>
           </tr>
           <tr>
-            <td><code>@navbarBackground</code></td>
-            <td><code>@grayDarker</code></td>
-            <td><span class="swatch" style="background-color: #222;"></span></td>
+            <td><code>@inputBackground</code></td>
+            <td><code>@white</code></td>
           </tr>
           <tr>
-            <td><code>@navbarBackgroundHighlight</code></td>
-            <td><code>@grayDark</code></td>
-            <td><span class="swatch" style="background-color: #333;"></span></td>
+            <td><code>@inputBorder</code></td>
+            <td><code>#ccc</code></td>
           </tr>
           <tr>
-            <td><code>@navbarText</code></td>
-            <td><code>@grayLight</code></td>
-            <td><span class="swatch" style="background-color: #999;"></span></td>
+            <td><code>@inputBorderRadius</code></td>
+            <td><code>3px</code></td>
           </tr>
           <tr>
-            <td><code>@navbarLinkColor</code></td>
-            <td><code>@grayLight</code></td>
-            <td><span class="swatch" style="background-color: #999;"></span></td>
+            <td><code>@inputDisabledBackground</code></td>
+            <td><code>@grayLighter</code></td>
           </tr>
           <tr>
-            <td><code>@navbarLinkColorHover</code></td>
-            <td><code>@white</code></td>
-            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+            <td><code>@formActionsBackground</code></td>
+            <td><code>#f5f5f5</code></td>
           </tr>
         </tbody>
       </table>
-    </div>
-    <div class="span6">
       <h4>Form states and alerts</h4>
       <table class="table table-bordered table-striped">
         <tbody>
@@ -389,6 +513,130 @@
         </tbody>
       </table>
     </div>
+    <div class="span6">
+      <h4>Navbar</h4>
+      <table class="table table-bordered table-striped">
+        <tbody>
+          <tr>
+            <td class="span3"><code>@navbarHeight</code></td>
+            <td>40px</td>
+            <td class="swatch-col"></td>
+          </tr>
+          <tr>
+            <td><code>@navbarBackground</code></td>
+            <td><code>@grayDarker</code></td>
+            <td><span class="swatch" style="background-color: #222;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarBackgroundHighlight</code></td>
+            <td><code>@grayDark</code></td>
+            <td><span class="swatch" style="background-color: #333;"></span></td>
+          </tr>
+
+          <tr>
+            <td><code>@navbarText</code></td>
+            <td><code>@grayLight</code></td>
+            <td><span class="swatch" style="background-color: #999;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarLinkColor</code></td>
+            <td><code>@grayLight</code></td>
+            <td><span class="swatch" style="background-color: #999;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarLinkColorHover</code></td>
+            <td><code>@white</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarLinkColorActive</code></td>
+            <td><code>@navbarLinkColorHover</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarLinkBackgroundHover</code></td>
+            <td><code>transparent</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: transparent;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarLinkBackgroundActive</code></td>
+            <td><code>@navbarBackground</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+          </tr>
+
+          <tr>
+            <td><code>@navbarSearchBackground</code></td>
+            <td><code>lighten(@navbarBackground, 25%)</code></td>
+            <td><span class="swatch" style="background-color: #666;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarSearchBackgroundFocus</code></td>
+            <td><code>@white</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarSearchBorder</code></td>
+            <td><code>darken(@navbarSearchBackground, 30%)</code></td>
+            <td><span class="swatch" style="background-color: #111;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarSearchPlaceholderColor</code></td>
+            <td><code>#ccc</code></td>
+            <td><span class="swatch" style="background-color: #ccc;"></span></td>
+          </tr>
+          <tr>
+            <td><code>@navbarBrandColor</code></td>
+            <td><code>@navbarLinkColor</code></td>
+            <td><span class="swatch swatch-bordered" style="background-color: #fff;"></span></td>
+          </tr>
+        </tbody>
+      </table>
+      <h4>Dropdowns</h4>
+      <table class="table table-bordered table-striped">
+        <tbody>
+          <tr>
+            <td class="span2"><code>@dropdownBackground</code></td>
+            <td><code>@white</code></td>
+          </tr>
+          <tr>
+            <td><code>@dropdownBorder</code></td>
+            <td><code>rgba(0,0,0,.2)</code></td>
+          </tr>
+          <tr>
+            <td><code>@dropdownLinkColor</code></td>
+            <td><code>@grayDark</code></td>
+          </tr>
+          <tr>
+            <td><code>@dropdownLinkColorHover</code></td>
+            <td><code>@white</code></td>
+          </tr>
+          <tr>
+            <td><code>@dropdownLinkBackgroundHover</code></td>
+            <td><code>@linkColor</code></td>
+          </tr>
+        </tbody>
+      </table>
+      <h4>Hero unit</h4>
+      <table class="table table-bordered table-striped">
+        <tbody>
+          <tr>
+            <td class="span3"><code>@heroUnitBackground</code></td>
+            <td><code>@grayLighter</code></td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #eee;"></span></td>
+          </tr>
+          <tr>
+            <td class="span2"><code>@heroUnitHeadingColor</code></td>
+            <td><code>inherit</code></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td><code>@heroUnitLeadColor</code></td>
+            <td><code>inhereit</code></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div><!-- /row -->
 
 </section>
@@ -460,17 +708,17 @@
       </tr>
       <tr>
         <td><code>.size()</code></td>
-        <td><code>@height: 5px, @width: 5px</code></td>
+        <td><code>@height @width</code></td>
         <td>Quickly set the height and width on one line</td>
       </tr>
       <tr>
         <td><code>.square()</code></td>
-        <td><code>@size: 5px</code></td>
+        <td><code>@size</code></td>
         <td>Builds on <code>.size()</code> to set the width and height as same value</td>
       </tr>
       <tr>
         <td><code>.opacity()</code></td>
-        <td><code>@opacity: 100</code></td>
+        <td><code>@opacity</code></td>
         <td>Set, in whole numbers, the opacity percentage (e.g., "50" or "75")</td>
       </tr>
     </tbody>
@@ -564,6 +812,16 @@
         <td><code>@fluidGridColumnWidth, @fluidGridGutterWidth</code></td>
         <td>Generate a precent grid system with <em>n</em> columns and <em>x</em> % wide gutter</td>
       </tr>
+      <tr>
+        <td><code>#grid > .input()</code></td>
+        <td><code>@gridColumnWidth, @gridGutterWidth</code></td>
+        <td>Generate the pixel grid system for <code>input</code> elements, accounting for padding and borders</td>
+      </tr>
+      <tr>
+        <td><code>.makeColumn</code></td>
+        <td><code>@columns: 1, @offset: 0</code></td>
+        <td>Turn any <code>div</code> into a grid column without the <code>.span*</code> classes</td>
+      </tr>
     </tbody>
   </table>
   <h3>CSS3 properties</h3>
@@ -578,12 +836,12 @@
     <tbody>
       <tr>
         <td><code>.border-radius()</code></td>
-        <td><code>@radius: 5px</code></td>
+        <td><code>@radius</code></td>
         <td>Round the corners of an element. Can be a single value or four space-separated values</td>
       </tr>
       <tr>
         <td><code>.box-shadow()</code></td>
-        <td><code>@shadow: 0 1px 3px rgba(0,0,0,.25)</code></td>
+        <td><code>@shadow</code></td>
         <td>Add a drop shadow to an element</td>
       </tr>
       <tr>
@@ -603,7 +861,7 @@
       </tr>
       <tr>
         <td><code>.translate()</code></td>
-        <td><code>@x: 0, @y: 0</code></td>
+        <td><code>@x, @y</code></td>
         <td>Move an element on the x and y planes</td>
       </tr>
       <tr>
@@ -627,13 +885,18 @@
         <td>Control cursor selection of text on a page</td>
       </tr>
       <tr>
+        <td><code>.backface-visibility()</code></td>
+        <td><code>@visibility: visible</code></td>
+        <td>Prevent flickering of content when using CSS 3D transforms</td>
+      </tr>
+      <tr>
         <td><code>.resizable()</code></td>
         <td><code>@direction: both</code></td>
         <td>Make any element resizable on the right and bottom</td>
       </tr>
       <tr>
         <td><code>.content-columns()</code></td>
-        <td><code>@columnCount, @columnGap: @gridColumnGutter</code></td>
+        <td><code>@columnCount, @columnGap: @gridGutterWidth</code></td>
         <td>Make the content of any element use CSS3 columns</td>
       </tr>
     </tbody>
@@ -720,7 +983,7 @@
     <div class="span4">
       <h3>Command line</h3>
       <p>Install the LESS command line tool via Node and run the following command:</p>
-        <pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
+        <pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre>
       <p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
     </div><!-- /span4 -->
     <div class="span4">