mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 15:50:01 +02:00
Code Issues Releases Wiki Activity

Fix -flex compile on Sass Ruby #17046

Browse Source
This commit is contained in:
Gleb Mazovetskiy
2015-08-20 08:38:02 +01:00
parent 6b1cf58d58
commit f88cbe7ee4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,15 +22,13 @@
@include media-breakpoint-up($breakpoint) { @include media-breakpoint-up($breakpoint) {
// Work around cross-media @extend (https://github.com/sass/sass/issues/1050) // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
%grid-column-float-#{$breakpoint} { %grid-column-float-#{$breakpoint} {
@if $enable-flex { float: left;
// Do nothing
} @else {
float: left;
}
} }
@for $i from 1 through $columns { @for $i from 1 through $columns {
.col-#{$breakpoint}-#{$i} { .col-#{$breakpoint}-#{$i} {
@extend %grid-column-float-#{$breakpoint}; @if not $enable-flex {
@extend %grid-column-float-#{$breakpoint};
}
@include make-col-span($i, $columns); @include make-col-span($i, $columns);
} }
} }