1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 16:19:53 +02:00

stub out flexbox grid variation via -flex

This commit is contained in:
Mark Otto
2015-04-27 01:43:14 -07:00
parent b9ed61854c
commit 9d4d6ef3a2
4 changed files with 45 additions and 3 deletions

View File

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

View File

@@ -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) {