diff options
| author | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
| commit | 4045740c54504ede15f831c877f134752b6c12be (patch) | |
| tree | c3291b31e7dd119fbf43028300f49213e9912652 /docs/_includes | |
| parent | e40df7cfacef0b581810c8ec661923054541638c (diff) | |
| parent | 4abb0957833c7158563244d1770ab9a5e6966150 (diff) | |
| download | bootstrap-4045740c54504ede15f831c877f134752b6c12be.tar.xz bootstrap-4045740c54504ede15f831c877f134752b6c12be.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/css/grid.html | 4 | ||||
| -rw-r--r-- | docs/_includes/getting-started/examples.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index f1ee7fcd1..429ef90f9 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -347,10 +347,10 @@ <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-sm-6 diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html index 849d044c0..b1739f1d7 100644 --- a/docs/_includes/getting-started/examples.html +++ b/docs/_includes/getting-started/examples.html @@ -1,7 +1,7 @@ <div class="bs-docs-section"> <h1 id="examples" class="page-header">Examples</h1> - <p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p> + <p class="lead">Build on the basic template above with Bootstrap's many components. We encourage you to customize and adapt Bootstrap to suit your individual project's needs.</p> <h3 id="examples-framework">Using the framework</h3> <div class="row bs-examples"> |