diff options
| author | Mark Otto <[email protected]> | 2012-02-11 10:38:41 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-11 10:38:41 -0800 |
| commit | 102bb8e68439d28334c2c9f6e4579fdd9950c102 (patch) | |
| tree | f9daede188e2f770a761ac6ac2e349037376396a /docs | |
| parent | 2679c3ebe3bb21599826dd204b1c9df44d217497 (diff) | |
| download | bootstrap-102bb8e68439d28334c2c9f6e4579fdd9950c102.tar.xz bootstrap-102bb8e68439d28334c2c9f6e4579fdd9950c102.zip | |
clear up some messaging in docs on fluid grid system and nesting overall
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52675 -> 52675 bytes | |||
| -rw-r--r-- | docs/scaffolding.html | 18 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 18 |
3 files changed, 34 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 81a5fd5ba..ed52bb830 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 6ed5857ff..58bf88b24 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -173,7 +173,8 @@ <div class="row"> <div class="span6"> <p>With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.</p> - <h4>Example</h4> + <h3>Example</h3> + <p>Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.</p> <div class="row show-grid"> <div class="span6"> Level 1 of column @@ -187,6 +188,21 @@ </div> </div> </div> + <h3>Fluid example</h3> + <p>Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level 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> </div> <div class="span6"> <pre class="prettyprint linenums"> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 46437782b..74b824d9c 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -97,7 +97,8 @@ <div class="row"> <div class="span6"> <p>{{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.{{/i}}</p> - <h4>{{_i}}Example{{/i}}</h4> + <h3>{{_i}}Example{{/i}}</h3> + <p>{{_i}}Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.{{/i}}</p> <div class="row show-grid"> <div class="span6"> {{_i}}Level 1 of column{{/i}} @@ -111,6 +112,21 @@ </div> </div> </div> + <h3>{{_i}}Fluid example{{/i}}</h3> + <p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level 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> </div> <div class="span6"> <pre class="prettyprint linenums"> |