aboutsummaryrefslogtreecommitdiff
path: root/docs/scaffolding.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-07 11:06:08 -0700
committerMark Otto <[email protected]>2012-09-07 11:06:08 -0700
commit6c5c3c81ecf6f329e950ca4e8970bbcaa7597043 (patch)
tree19029f7c4d46fa59c15809980a0f4a918ce25f91 /docs/scaffolding.html
parent7a0f5c6c00ab7f70346e59503f850c5b5623f908 (diff)
parent138b5a8c0569e548ec93803aaa88ea7033363680 (diff)
downloadbootstrap-6c5c3c81ecf6f329e950ca4e8970bbcaa7597043.tar.xz
bootstrap-6c5c3c81ecf6f329e950ca4e8970bbcaa7597043.zip
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos
Diffstat (limited to 'docs/scaffolding.html')
-rw-r--r--docs/scaffolding.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 75cb761d5..4b23eed88 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -201,7 +201,7 @@
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.</p>
<div class="row show-grid">
<div class="span9">
- Level 1 of column
+ Level 1 column
<div class="row show-grid">
<div class="span6">
Level 2
@@ -318,10 +318,10 @@
<pre class="prettyprint linenums">
&lt;div class="row-fluid"&gt;
&lt;div class="span12"&gt;
- Level 1 of column
+ Fluid 12
&lt;div class="row-fluid"&gt;
- &lt;div class="span6"&gt;Level 2&lt;/div&gt;
- &lt;div class="span6"&gt;Level 2&lt;/div&gt;
+ &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
+ &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;