diff options
| author | Mark Otto <[email protected]> | 2016-02-06 20:33:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 20:33:26 -0800 |
| commit | d7d0e186bdfb52856a455c438538582fe95324e6 (patch) | |
| tree | 43484b5b58471431662e0a8be2b3bb9eb7f00d31 /docs/examples/grid | |
| parent | f6ad665c26f8a376a806721feaf3f38ceadc7e79 (diff) | |
| parent | cb7b78087690e756e33b6f6abdb3548f73f8bb1b (diff) | |
| download | bootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.tar.xz bootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.zip | |
Merge branch 'v4-dev' into v4-split-buttons
Diffstat (limited to 'docs/examples/grid')
| -rw-r--r-- | docs/examples/grid/index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index cafbb4fc5..9e831115b 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -104,7 +104,7 @@ <hr> <h3>Mixed: mobile and desktop</h3> - <p>The Bootstrap 3 grid system has four tiers of classes: xs (phones), sm (tablets), md (desktops), and lg (larger desktops). You can use nearly any combination of these classes to create more dynamic and flexible layouts.</p> + <p>The Bootstrap v4 grid system has five tiers of classes: xs (extra small), sm (small), md (medium), lg (large), and xl (extra large). You can use nearly any combination of these classes to create more dynamic and flexible layouts.</p> <p>Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.</p> <div class="row"> <div class="col-xs-12 col-md-8">.col-xs-12 .col-md-8</div> @@ -159,11 +159,11 @@ <p>Reset offsets, pushes, and pulls at specific breakpoints.</p> <div class="row"> <div class="col-sm-5 col-md-6">.col-sm-5 .col-md-6</div> - <div class="col-sm-5 col-sm-offset-2 col-md-6 col-md-offset-0">.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0</div> + <div class="col-sm-5 offset-sm-2 col-md-6 offset-md-0">.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0</div> </div> <div class="row"> <div class="col-sm-6 col-md-5 col-lg-6">.col-sm-6 .col-md-5 .col-lg-6</div> - <div class="col-sm-6 col-md-5 col-md-offset-2 col-lg-6 col-lg-offset-0">.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0</div> + <div class="col-sm-6 col-md-5 offset-md-2 col-lg-6 offset-lg-0">.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0</div> </div> |