mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-18 10:52:19 +01:00
stub out flexbox grid variation via -flex
This commit is contained in:
parent
b9ed61854c
commit
9d4d6ef3a2
@ -44,3 +44,28 @@
|
||||
|
||||
@include make-grid-columns();
|
||||
|
||||
// Flex column reordering
|
||||
@if $enable-flex {
|
||||
.col-xs-first { order: -1; }
|
||||
.col-xs-last { order: 1; }
|
||||
|
||||
@include media-breakpoint-up(sm) {
|
||||
.col-sm-first { order: -1; }
|
||||
.col-sm-last { order: 1; }
|
||||
}
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
.col-md-first { order: -1; }
|
||||
.col-md-last { order: 1; }
|
||||
}
|
||||
|
||||
@include media-breakpoint-up(lg) {
|
||||
.col-lg-first { order: -1; }
|
||||
.col-lg-last { order: 1; }
|
||||
}
|
||||
|
||||
@include media-breakpoint-up(xl) {
|
||||
.col-xl-first { order: -1; }
|
||||
.col-xl-last { order: 1; }
|
||||
}
|
||||
}
|
||||
|
@ -37,6 +37,7 @@ $link-hover-decoration: underline !default;
|
||||
//
|
||||
// Quickly modify global styling by enabling or disabling features.
|
||||
|
||||
$enable-flex: true !default;
|
||||
$enable-rounded: true !default;
|
||||
$enable-shadows: false !default;
|
||||
$enable-gradients: false !default;
|
||||
|
@ -22,7 +22,11 @@
|
||||
@include media-breakpoint-up($breakpoint) {
|
||||
// Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
|
||||
%grid-column-float-#{$breakpoint} {
|
||||
float: left;
|
||||
@if $enable-flex {
|
||||
// Do nothing
|
||||
} @else {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
@for $i from 1 through $columns {
|
||||
.col-#{$breakpoint}-#{$i} {
|
||||
|
@ -11,6 +11,10 @@
|
||||
}
|
||||
|
||||
@mixin make-row($gutter: $grid-gutter-width) {
|
||||
@if $enable-flex {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
margin-left: ($gutter / -2);
|
||||
margin-right: ($gutter / -2);
|
||||
@include clearfix();
|
||||
@ -18,14 +22,22 @@
|
||||
|
||||
@mixin make-col($gutter: $grid-gutter-width) {
|
||||
position: relative;
|
||||
float: left;
|
||||
@if $enable-flex {
|
||||
// Do nothing
|
||||
} @else {
|
||||
float: left;
|
||||
}
|
||||
min-height: 1px;
|
||||
padding-left: ($gutter / 2);
|
||||
padding-right: ($gutter / 2);
|
||||
}
|
||||
|
||||
@mixin make-col-span($size, $columns: $grid-columns) {
|
||||
width: percentage($size / $columns);
|
||||
@if $enable-flex {
|
||||
flex: 0 0 percentage($size / $columns);
|
||||
} @else {
|
||||
width: percentage($size / $columns);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin make-col-offset($size, $columns: $grid-columns) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user