diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/_includes/css/grid.html | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs/_includes/css/grid.html')
| -rw-r--r-- | docs/_includes/css/grid.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index 8ff53dd71..429ef90f9 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -347,16 +347,16 @@ <h3 id="grid-nesting">Nesting columns</h3> - <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-md-*</code> columns within an existing <code>.col-md-*</code> column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).</p> + <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-sm-*</code> columns within an existing <code>.col-sm-*</code> column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).</p> <div class="row show-grid"> <div class="col-sm-9"> - Level 1: .col-md-9 + Level 1: .col-sm-9 <div class="row show-grid"> <div class="col-xs-8 col-sm-6"> - Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6 </div> <div class="col-xs-4 col-sm-6"> - Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6 </div> </div> </div> @@ -364,13 +364,13 @@ {% highlight html %} <div class="row"> <div class="col-sm-9"> - Level 1: .col-md-9 + Level 1: .col-sm-9 <div class="row"> <div class="col-xs-8 col-sm-6"> - Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6 </div> <div class="col-xs-4 col-sm-6"> - Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6 </div> </div> </div> |