diff options
| author | Mark Otto <[email protected]> | 2016-02-06 15:18:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 15:18:19 -0800 |
| commit | 3b38801c5a23443998be846af4c29c7321358fe2 (patch) | |
| tree | b5f7672e99d1a969a3072d5b9c6535474c0f6cd5 /docs/examples | |
| parent | c344ff5b17101bec9840a5439b4b79684606c4ba (diff) | |
| parent | fffaaed0fdb6203dceaeff0cdd663b79bb7f81eb (diff) | |
| download | bootstrap-3b38801c5a23443998be846af4c29c7321358fe2.tar.xz bootstrap-3b38801c5a23443998be846af4c29c7321358fe2.zip | |
Merge pull request #19099 from twbs/v4-grid-redux
v4: Grid redux
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/blog/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 4 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/grid/index.html | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index a9f9b78ed..d4e9dbcc5 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -111,7 +111,7 @@ </div><!-- /.blog-main --> - <div class="col-sm-3 col-sm-offset-1 blog-sidebar"> + <div class="col-sm-3 offset-sm-1 blog-sidebar"> <div class="sidebar-module sidebar-module-inset"> <h4>About</h4> <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla sed consectetur.</p> diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 5e01f8df0..986c4e8a5 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -136,11 +136,11 @@ <hr class="featurette-divider"> <div class="row featurette"> - <div class="col-md-7 col-md-push-5"> + <div class="col-md-7 push-md-5"> <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2> <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p> </div> - <div class="col-md-5 col-md-pull-7"> + <div class="col-md-5 pull-md-7"> <img class="featurette-image img-fluid center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> </div> </div> diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index a86e3ecb9..65cc380cb 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -63,7 +63,7 @@ <li><a href="">Another nav item</a></li> </ul> </div> - <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"> + <div class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 main"> <h1 class="page-header">Dashboard</h1> <div class="row placeholders"> diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 74b5852f5..9e831115b 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -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> |