mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-25 14:30:46 +02:00
Code Issues Releases Wiki Activity

Drop offsets and push/pull for new order variants

Browse Source
This commit is contained in:
Mark Otto
2017-06-29 22:33:33 -07:00
committed by Mark Otto
parent 8b34a0e172
commit 4982926dcf
3 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scss/mixins/_grid-framework.scss
View File

@@ -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
}
}
}

4
scss/utilities/_flex.scss
View File

@@ -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; }