diff options
| author | Gleb Mazovetskiy <[email protected]> | 2015-08-20 08:38:02 +0100 |
|---|---|---|
| committer | Gleb Mazovetskiy <[email protected]> | 2015-08-20 08:38:02 +0100 |
| commit | f88cbe7ee4e2b765b1c4c53efa9a5077e6a22529 (patch) | |
| tree | 776b11b5e694ddc17e00dc2f527fe1e61772cfa4 | |
| parent | 6b1cf58d58043f5906b65314c0322406c3763258 (diff) | |
| download | bootstrap-f88cbe7ee4e2b765b1c4c53efa9a5077e6a22529.tar.xz bootstrap-f88cbe7ee4e2b765b1c4c53efa9a5077e6a22529.zip | |
Fix -flex compile on Sass Ruby #17046
| -rw-r--r-- | scss/mixins/_grid-framework.scss | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss index ad2060cbf..aa5f4924a 100644 --- a/scss/mixins/_grid-framework.scss +++ b/scss/mixins/_grid-framework.scss @@ -22,15 +22,13 @@ @include media-breakpoint-up($breakpoint) { // Work around cross-media @extend (https://github.com/sass/sass/issues/1050) %grid-column-float-#{$breakpoint} { - @if $enable-flex { - // Do nothing - } @else { - float: left; - } + float: left; } @for $i from 1 through $columns { .col-#{$breakpoint}-#{$i} { - @extend %grid-column-float-#{$breakpoint}; + @if not $enable-flex { + @extend %grid-column-float-#{$breakpoint}; + } @include make-col-span($i, $columns); } } |