aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scss/mixins/_grid-framework.scss10
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);
}
}