diff options
| author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /docs/templates/pages/scaffolding.mustache | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'docs/templates/pages/scaffolding.mustache')
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 0d9c191e36..85ae5ea029 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -130,7 +130,7 @@ <p>{{_i}}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.{{/i}}</p> <div class="row show-grid"> <div class="span9"> - {{_i}}Level 1 of column{{/i}} + {{_i}}Level 1 column{{/i}} <div class="row show-grid"> <div class="span6"> {{_i}}Level 2{{/i}} @@ -247,10 +247,10 @@ <pre class="prettyprint linenums"> <div class="row-fluid"> <div class="span12"> - {{_i}}Level 1 of column{{/i}} + {{_i}}Fluid 12{{/i}} <div class="row-fluid"> - <div class="span6">{{_i}}Level 2{{/i}}</div> - <div class="span6">{{_i}}Level 2{{/i}}</div> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> </div> </div> </div> @@ -442,7 +442,7 @@ </table> <h3>{{_i}}When to use{{/i}}</h3> - <p>{{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}</p> + <p>{{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.{{/i}}</p> <h3>{{_i}}Responsive utilities test case{{/i}}</h3> <p>{{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}</p> |