diff options
| author | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
| commit | d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f (patch) | |
| tree | 8bc5e771a8b3dad44e16aedb7ac1827ca368d952 /docs/scaffolding.html | |
| parent | ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 (diff) | |
| parent | 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a (diff) | |
| download | bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.tar.xz bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index b2962f317..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"> @@ -315,7 +331,7 @@ </div> <div class="span8"> <h2>Supported devices</h2> - <p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p> + <p>Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p> <table class="table table-bordered table-striped"> <thead> <tr> @@ -339,7 +355,7 @@ <tr> <td>Landscape tablets</td> <td>768px to 980px</td> - <td>44px</td> + <td>42px</td> <td>20px</td> </tr> <tr> |