From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 20 Aug 2015 07:38:02 +0000 (+0100)
Subject: Fix -flex compile on Sass Ruby #17046
X-Git-Tag: v4.0.0-alpha.2~516
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f88cbe7ee4e2b765b1c4c53efa9a5077e6a22529;p=thirdparty%2Fbootstrap.git

Fix -flex compile on Sass Ruby #17046
---

diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index ad2060cbf6..aa5f4924ae 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);
         }
       }