diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 81a5fd5ba7..ed52bb8304 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 6ed5857fff..58bf88b24e 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -173,7 +173,8 @@

With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

-

Example

+

Example

+

Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested .span3 columns should be placed within a .span6.

Level 1 of column @@ -187,6 +188,21 @@
+

Fluid example

+

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.

+
+
+ Fluid 12 +
+
+ Fluid 6 +
+
+ Fluid 6 +
+
+
+
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 46437782ba..74b824d9ca 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -97,7 +97,8 @@
   

{{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.{{/i}}

-

{{_i}}Example{{/i}}

+

{{_i}}Example{{/i}}

+

{{_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 .span3 columns should be placed within a .span6.{{/i}}

{{_i}}Level 1 of column{{/i}} @@ -111,6 +112,21 @@
+

{{_i}}Fluid example{{/i}}

+

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

+
+
+ {{_i}}Fluid 12{{/i}} +
+
+ {{_i}}Fluid 6{{/i}} +
+
+ {{_i}}Fluid 6{{/i}} +
+
+
+