aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-11 10:38:41 -0800
committerMark Otto <[email protected]>2012-02-11 10:38:41 -0800
commit102bb8e68439d28334c2c9f6e4579fdd9950c102 (patch)
treef9daede188e2f770a761ac6ac2e349037376396a /docs/templates
parent2679c3ebe3bb21599826dd204b1c9df44d217497 (diff)
downloadbootstrap-102bb8e68439d28334c2c9f6e4579fdd9950c102.tar.xz
bootstrap-102bb8e68439d28334c2c9f6e4579fdd9950c102.zip
clear up some messaging in docs on fluid grid system and nesting overall
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/scaffolding.mustache18
1 files changed, 17 insertions, 1 deletions
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">