+
Second, but last
-
@@ -542,33 +526,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.
{% example html %}
.col-md-4
-
.col-md-4 .offset-md-4
+
.col-md-4 .ml-auto
-
.col-md-3 .offset-md-3
-
.col-md-3 .offset-md-3
+
.col-md-3 .ml-md-auto
+
.col-md-3 .ml-md-auto
-
.col-md-6 .offset-md-3
-
-{% endexample %}
-
-
-### Push and pull
-
-Easily change the order of our built-in grid columns with `.push-md-*` and `.pull-md-*` modifier classes.
-
-
-{% example html %}
-
-
.col-md-9 .push-md-3
-
.col-md-3 .pull-md-9
+
.col-auto .mr-auto
+
.col-auto
{% endexample %}
@@ -639,11 +611,6 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS
// Make the element grid-ready (applying everything but the width)
@include make-col-ready();
@include make-col($size, $columns: $grid-columns);
-
-// Get fancy by offsetting, or changing the sort order
-@include make-col-offset($size, $columns: $grid-columns);
-@include make-col-push($size, $columns: $grid-columns);
-@include make-col-pull($size, $columns: $grid-columns);
{% endhighlight %}
### Example usage
@@ -701,8 +668,8 @@ Using our built-in grid Sass variables and maps, it's possible to completely cus
The number of grid columns can be modified via Sass variables. `$grid-columns` is used to generate the widths (in percent) of each individual column while `$grid-gutter-width` allows breakpoint-specific widths that are divided evenly across `padding-left` and `padding-right` for the column gutters.
{% highlight scss %}
-$grid-columns: 12 !default;
-$grid-gutter-width: 30px !default;
+$grid-columns: 12 !default;
+$grid-gutter-width: 30px !default;
{% endhighlight %}
### Grid tiers
@@ -724,4 +691,4 @@ $container-max-widths: (
);
{% endhighlight %}
-When making any changes to the Sass variables or maps, you'll need to save your changes and recompile. Doing so will out a brand new set of predefined grid classes for column widths, offsets, pushes, and pulls. Responsive visibility utilities will also be updated to use the custom breakpoints.
+When making any changes to the Sass variables or maps, you'll need to save your changes and recompile. Doing so will out a brand new set of predefined grid classes for column widths and ordering. Responsive visibility utilities will also be updated to use the custom breakpoints.
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 236aadf0c7fb..d8195ddfa19c 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -46,20 +46,9 @@
}
}
- @each $modifier in (pull, push) {
- @for $i from 0 through $columns {
- .#{$modifier}#{$infix}-#{$i} {
- @include make-col-modifier($modifier, $i, $columns)
- }
- }
- }
-
- // `$columns - 1` because offsetting by the width of an entire row isn't possible
- @for $i from 0 through ($columns - 1) {
- @if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0
- .offset#{$infix}-#{$i} {
- @include make-col-modifier(offset, $i, $columns)
- }
+ @for $i from 1 through $columns {
+ .order#{$infix}-#{$i} {
+ order: $i;
}
}
}
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 25bdc74d426b..5c00f57d76a0 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -45,26 +45,3 @@
// do not appear to require this.
max-width: percentage($size / $columns);
}
-
-@mixin make-col-offset($size, $columns: $grid-columns) {
- margin-left: percentage($size / $columns);
-}
-
-@mixin make-col-push($size, $columns: $grid-columns) {
- left: if($size > 0, percentage($size / $columns), auto);
-}
-
-@mixin make-col-pull($size, $columns: $grid-columns) {
- right: if($size > 0, percentage($size / $columns), auto);
-}
-
-@mixin make-col-modifier($type, $size, $columns) {
- // Work around the lack of dynamic mixin @include support (https://github.com/sass/sass/issues/626)
- @if $type == push {
- @include make-col-push($size, $columns);
- } @else if $type == pull {
- @include make-col-pull($size, $columns);
- } @else if $type == offset {
- @include make-col-offset($size, $columns);
- }
-}
diff --git a/scss/utilities/_flex.scss b/scss/utilities/_flex.scss
index cc696785dcbf..b28c0b97de98 100644
--- a/scss/utilities/_flex.scss
+++ b/scss/utilities/_flex.scss
@@ -6,10 +6,6 @@
@include media-breakpoint-up($breakpoint) {
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);
- .order#{$infix}-first { order: -1; }
- .order#{$infix}-last { order: 1; }
- .order#{$infix}-0 { order: 0; }
-
.flex#{$infix}-row { flex-direction: row !important; }
.flex#{$infix}-column { flex-direction: column !important; }
.flex#{$infix}-row-reverse { flex-direction: row-reverse !important; }