diff --git a/docs/scaffolding.html b/docs/scaffolding.html index db4f84599f..b7d343fac3 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -230,110 +230,6 @@ - -
-
-

Fluid grid system

-
- -

Live fluid grid example

-

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.

-
-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
-
-
-
4
-
8
-
-
-
6
-
6
-
-
-
12
-
-
- -

Basic fluid grid HTML

-

Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.

-
-<div class="row-fluid">
-  <div class="span4">...</div>
-  <div class="span8">...</div>
-</div>
-
- -

Fluid offsetting

-

Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

-
-
-
4
-
4 offset 4
-
-
-
3 offset 3
-
3 offset 3
-
-
-
6 offset 6
-
-
-
-<div class="row-fluid">
-  <div class="span4">...</div>
-  <div class="span4 offset2">...</div>
-</div>
-
- -

Fluid nesting

-

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.

-
-
- Fluid 12 -
-
- Fluid 6 -
-
- Fluid 6 -
-
-
-
-
-<div class="row-fluid">
-  <div class="span12">
-    Fluid 12
-    <div class="row-fluid">
-      <div class="span6">Fluid 6</div>
-      <div class="span6">Fluid 6</div>
->>>>>>> 2.1.2-wip
-    </div>
-  </div>
-</div>
-
-
- - - diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 1fe73f3138..3d20624a4a 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -159,110 +159,6 @@ - -
-
-

{{_i}}Fluid grid system{{/i}}

-
- -

{{_i}}Live fluid grid example{{/i}}

-

{{_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}}

-
-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
-
-
-
4
-
8
-
-
-
6
-
6
-
-
-
12
-
-
- -

{{_i}}Basic fluid grid HTML{{/i}}

-

{{_i}}Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.{{/i}}

-
-<div class="row-fluid">
-  <div class="span4">...</div>
-  <div class="span8">...</div>
-</div>
-
- -

{{_i}}Fluid offsetting{{/i}}

-

{{_i}}Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.{{/i}}

-
-
-
4
-
4 offset 4
-
-
-
3 offset 3
-
3 offset 3
-
-
-
6 offset 6
-
-
-
-<div class="row-fluid">
-  <div class="span4">...</div>
-  <div class="span4 offset2">...</div>
-</div>
-
- -

{{_i}}Fluid nesting{{/i}}

-

{{_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}}

-
-
- {{_i}}Fluid 12{{/i}} -
-
- {{_i}}Fluid 6{{/i}} -
-
- {{_i}}Fluid 6{{/i}} -
-
-
-
-
-<div class="row-fluid">
-  <div class="span12">
-    {{_i}}Fluid 12{{/i}}
-    <div class="row-fluid">
-      <div class="span6">{{_i}}Fluid 6{{/i}}</div>
-      <div class="span6">{{_i}}Fluid 6{{/i}}</div>
->>>>>>> 2.1.2-wip
-    </div>
-  </div>
-</div>
-
-
- - -