From: Mark Otto <markdotto@gmail.com>
Date: Sat, 12 Sep 2015 19:30:57 +0000 (-0700)
Subject: fixes #17583: only include clearfix on make-container mixin when not in flex mode
X-Git-Tag: v4.0.0-alpha.2~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339130c040582c44b9b13504c57205a5a3f0511b;p=thirdparty%2Fbootstrap.git

fixes #17583: only include clearfix on make-container mixin when not in flex mode
---

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 87b4ac94a6..585c80f27d 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -7,7 +7,10 @@
   margin-left: auto;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  @include clearfix();
+  @if $enable-flex {
+  } @else {
+    @include clearfix();
+  }
 }