]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #17583: only include clearfix on make-container mixin when not in flex mode
authorMark Otto <markdotto@gmail.com>
Sat, 12 Sep 2015 19:30:57 +0000 (12:30 -0700)
committerMark Otto <markdotto@gmail.com>
Sat, 12 Sep 2015 19:30:57 +0000 (12:30 -0700)
scss/mixins/_grid.scss

index 87b4ac94a6342fc6d05ac825ce67baa0a0ba4a72..585c80f27d3b31ed8cde81a0fcd05a14139710f2 100644 (file)
@@ -7,7 +7,10 @@
   margin-left: auto;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  @include clearfix();
+  @if $enable-flex {
+  } @else {
+    @include clearfix();
+  }
 }