Merge branch '2.1.2-wip' into box-sizing-exercise

Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache

diff --cc docs/assets/css/bootstrap-responsive.css
Simple merge

diff --cc docs/assets/css/bootstrap.css
Simple merge

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/scaffolding.html
index 08d0dceb85074d86fd182a4b6cece1576eea61ae,4b23eed88685529ce26f939f6eec08da095e8e40..db4f84599f9dc5557b2ccad4f16dcaa81b4cee1b
--- 1/docs/scaffolding.html
--- 2/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@@ -221,7 -218,110 +221,111 @@@
      Level 1 column
      <div class="row">
        <div class="span6">Level 2</div>
-       <div class="span6">Level 2</div>
+       <div class="span3">Level 2</div>
+     </div>
+   </div>
+ </div>
+ </pre>
+         </section>
+ 
+ 
+ 
+         <!-- Fluid grid system
+         ================================================== -->
+         <section id="fluidGridSystem">
+           <div class="page-header">
+             <h1>Fluid grid system</h1>
+           </div>
+ 
+           <h2>Live fluid grid example</h2>
+           <p>The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.</p>
+           <div class="bs-docs-grid">
+             <div class="row-fluid show-grid">
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span4">4</div>
+               <div class="span4">4</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span8">8</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span6">6</div>
+               <div class="span6">6</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span12">12</div>
+             </div>
+           </div>
+ 
+           <h3>Basic fluid grid HTML</h3>
+           <p>Make any row "fluid" by changing <code>.row</code> to <code>.row-fluid</code>. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.</p>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span4"&gt;...&lt;/div&gt;
+   &lt;div class="span8"&gt;...&lt;/div&gt;
+ &lt;/div&gt;
+ </pre>
+ 
+           <h2>Fluid offsetting</h2>
+           <p>Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.</p>
+           <div class="bs-docs-grid">
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span4 offset4">4 offset 4</div>
+             </div><!-- /row -->
+             <div class="row-fluid show-grid">
+               <div class="span3 offset3">3 offset 3</div>
+               <div class="span3 offset3">3 offset 3</div>
+             </div><!-- /row -->
+             <div class="row-fluid show-grid">
+               <div class="span6 offset6">6 offset 6</div>
+             </div><!-- /row -->
+           </div>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span4"&gt;...&lt;/div&gt;
+   &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
+ &lt;/div&gt;
+ </pre>
+ 
+           <h2>Fluid nesting</h2>
+           <p>Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.</p>
+           <div class="row-fluid show-grid">
+             <div class="span12">
+               Fluid 12
+               <div class="row-fluid show-grid">
+                 <div class="span6">
+                   Fluid 6
+                 </div>
+                 <div class="span6">
+                   Fluid 6
+                 </div>
+               </div>
+             </div>
+           </div>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span12"&gt;
+     Fluid 12
+     &lt;div class="row-fluid"&gt;
+       &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
+       &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
++>>>>>>> 2.1.2-wip
      &lt;/div&gt;
    &lt;/div&gt;
  &lt;/div&gt;

diff --cc docs/templates/pages/scaffolding.mustache
index f687739b38372b02f1f11e95983303a72de7b50b,f87af3c900a5a897138e1785e3dd4c3a28560735..1fe73f313861076e3b4880d9544e4c2a5aa689e8
--- 1/docs/templates/pages/scaffolding.mustache
--- 2/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@@ -150,7 -147,110 +150,111 @@@
      {{_i}}Level 1 column{{/i}}
      <div class="row">
        <div class="span6">{{_i}}Level 2{{/i}}</div>
-       <div class="span6">{{_i}}Level 2{{/i}}</div>
+       <div class="span3">{{_i}}Level 2{{/i}}</div>
+     </div>
+   </div>
+ </div>
+ </pre>
+         </section>
+ 
+ 
+ 
+         <!-- Fluid grid system
+         ================================================== -->
+         <section id="fluidGridSystem">
+           <div class="page-header">
+             <h1>{{_i}}Fluid grid system{{/i}}</h1>
+           </div>
+ 
+           <h2>{{_i}}Live fluid grid example{{/i}}</h2>
+           <p>{{_i}}The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.{{/i}}</p>
+           <div class="bs-docs-grid">
+             <div class="row-fluid show-grid">
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+               <div class="span1">1</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span4">4</div>
+               <div class="span4">4</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span8">8</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span6">6</div>
+               <div class="span6">6</div>
+             </div>
+             <div class="row-fluid show-grid">
+               <div class="span12">12</div>
+             </div>
+           </div>
+ 
+           <h3>{{_i}}Basic fluid grid HTML{{/i}}</h3>
+           <p>{{_i}}Make any row "fluid" by changing <code>.row</code> to <code>.row-fluid</code>. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.{{/i}}</p>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span4"&gt;...&lt;/div&gt;
+   &lt;div class="span8"&gt;...&lt;/div&gt;
+ &lt;/div&gt;
+ </pre>
+ 
+           <h2>{{_i}}Fluid offsetting{{/i}}</h2>
+           <p>{{_i}}Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.{{/i}}</p>
+           <div class="bs-docs-grid">
+             <div class="row-fluid show-grid">
+               <div class="span4">4</div>
+               <div class="span4 offset4">4 offset 4</div>
+             </div><!-- /row -->
+             <div class="row-fluid show-grid">
+               <div class="span3 offset3">3 offset 3</div>
+               <div class="span3 offset3">3 offset 3</div>
+             </div><!-- /row -->
+             <div class="row-fluid show-grid">
+               <div class="span6 offset6">6 offset 6</div>
+             </div><!-- /row -->
+           </div>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span4"&gt;...&lt;/div&gt;
+   &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
+ &lt;/div&gt;
+ </pre>
+ 
+           <h2>{{_i}}Fluid nesting{{/i}}</h2>
+           <p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}</p>
+           <div class="row-fluid show-grid">
+             <div class="span12">
+               {{_i}}Fluid 12{{/i}}
+               <div class="row-fluid show-grid">
+                 <div class="span6">
+                   {{_i}}Fluid 6{{/i}}
+                 </div>
+                 <div class="span6">
+                   {{_i}}Fluid 6{{/i}}
+                 </div>
+               </div>
+             </div>
+           </div>
+ <pre class="prettyprint linenums">
+ &lt;div class="row-fluid"&gt;
+   &lt;div class="span12"&gt;
+     {{_i}}Fluid 12{{/i}}
+     &lt;div class="row-fluid"&gt;
+       &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
+       &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
++>>>>>>> 2.1.2-wip
      &lt;/div&gt;
    &lt;/div&gt;
  &lt;/div&gt;

diff --cc less/forms.less
Simple merge

diff --cc less/mixins.less
Simple merge