diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_includes/css/grid.html | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/css/grid.html')
| -rw-r--r-- | docs/_includes/css/grid.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index 3563aa78a..a6a4eaacb 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -14,7 +14,7 @@ <li>The negative margin is why the examples below are outdented. It's so that content within grid columns is lined up with non-grid content.</li> <li>Grid columns are created by specifying the number of twelve available columns you wish to span. For example, three equal columns would use three <code>.col-xs-4</code>.</li> <li>If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.</li> - <li>Grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes, and override grid classes targeted at smaller devices. Therefore, applying any <code>.col-md-</code> class to an element will not only affect its styling on medium devices but also on large devices if a <code>.col-lg-</code> class is not present.</li> + <li>Grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes, and override grid classes targeted at smaller devices. Therefore, e.g. applying any <code>.col-md-*</code> class to an element will not only affect its styling on medium devices but also on large devices if a <code>.col-lg-*</code> class is not present.</li> </ul> <p>Look to the examples for applying these principles to your code.</p> @@ -347,7 +347,7 @@ <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-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> + <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 fewer (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-sm-9 |