aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-06-29 22:33:33 -0700
committerMark Otto <[email protected]>2017-06-30 11:44:09 -0700
commit4982926dcfc66989f5f54c04d33c44a947cd919d (patch)
tree9b88764f5ab8e1ce90b4f6d2c6b3cf70a816d822 /docs
parent8b34a0e172181e251dd66afc6749591db6bcc3e6 (diff)
downloadbootstrap-4982926dcfc66989f5f54c04d33c44a947cd919d.tar.xz
bootstrap-4982926dcfc66989f5f54c04d33c44a947cd919d.zip
Drop offsets and push/pull for new order variants
Diffstat (limited to 'docs')
-rw-r--r--docs/4.0/layout/grid.md32
1 files changed, 10 insertions, 22 deletions
diff --git a/docs/4.0/layout/grid.md b/docs/4.0/layout/grid.md
index 64eec3689..032d11652 100644
--- a/docs/4.0/layout/grid.md
+++ b/docs/4.0/layout/grid.md
@@ -520,19 +520,19 @@ In addition to column clearing at responsive breakpoints, you may need to **rese
### Flex order
-Use flexbox utilities for controlling the **visual order** of your content.
+Use `.order-` classes for controlling the **visual order** of your content. These classes are responsive, so you can set the `order` by breakpoint (e.g., `.order-1.order-md-2`). Includes support for `1` through `12` across all five grid tiers.
<div class="bd-example-row">
{% example html %}
<div class="container">
<div class="row">
- <div class="col order-0">
+ <div class="col">
First, but unordered
</div>
- <div class="col order-last">
+ <div class="col order-12">
Second, but last
</div>
- <div class="col order-first">
+ <div class="col order-1">
Third, but first
</div>
</div>
@@ -542,33 +542,21 @@ Use flexbox utilities for controlling the **visual order** of your content.
### Offsetting columns
-Move columns to the right using `.offset-md-*` classes. These classes increase the left margin of a column by `*` columns. For example, `.offset-md-4` moves `.col-md-4` over four columns.
+With the move to flexbox in v4, we no longer have v3's style of offset classes. Instead, use margin utilities like `.mr-auto` to force sibling columns away from one another.
<div class="bd-example-row">
{% example html %}
<div class="row">
<div class="col-md-4">.col-md-4</div>
- <div class="col-md-4 offset-md-4">.col-md-4 .offset-md-4</div>
-</div>
-<div class="row">
- <div class="col-md-3 offset-md-3">.col-md-3 .offset-md-3</div>
- <div class="col-md-3 offset-md-3">.col-md-3 .offset-md-3</div>
+ <div class="col-md-4 ml-auto">.col-md-4 .ml-auto</div>
</div>
<div class="row">
- <div class="col-md-6 offset-md-3">.col-md-6 .offset-md-3</div>
-</div>
-{% endexample %}
+ <div class="col-md-3 ml-md-auto">.col-md-3 .ml-md-auto</div>
+ <div class="col-md-3 ml-md-auto">.col-md-3 .ml-md-auto</div>
</div>
-
-### Push and pull
-
-Easily change the order of our built-in grid columns with `.push-md-*` and `.pull-md-*` modifier classes.
-
-<div class="bd-example-row">
-{% example html %}
<div class="row">
- <div class="col-md-9 push-md-3">.col-md-9 .push-md-3</div>
- <div class="col-md-3 pull-md-9">.col-md-3 .pull-md-9</div>
+ <div class="col-auto mr-auto">.col-auto .mr-auto</div>
+ <div class="col-auto">.col-auto</div>
</div>
{% endexample %}
</div>