]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
nuke fluid grid docs again
authorMark Otto <markotto@twitter.com>
Sat, 8 Sep 2012 05:35:51 +0000 (22:35 -0700)
committerMark Otto <markotto@twitter.com>
Sat, 8 Sep 2012 05:35:51 +0000 (22:35 -0700)
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache

index db4f84599f9dc5557b2ccad4f16dcaa81b4cee1b..b7d343fac3a3286e7d65633e803f60783d9f1596 100644 (file)
 
 
 
-        <!-- 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;
-</pre>
-        </section>
-
-
-
 
         <!-- Layouts (Default and fluid)
         ================================================== -->
index 1fe73f313861076e3b4880d9544e4c2a5aa689e8..3d20624a4a1360db9f78078cae66d7534029767d 100644 (file)
 
 
 
-        <!-- 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;
-</pre>
-        </section>
-
-
-
 
         <!-- Layouts (Default and fluid)
         ================================================== -->