aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-09-12 12:30:57 -0700
committerMark Otto <[email protected]>2015-09-12 12:30:57 -0700
commit339130c040582c44b9b13504c57205a5a3f0511b (patch)
tree20fc4b72382994fac540120cbbd226abdfda4366
parentb811f8cf9628dbcbfe994f71588c5a0c921a092d (diff)
downloadbootstrap-339130c040582c44b9b13504c57205a5a3f0511b.tar.xz
bootstrap-339130c040582c44b9b13504c57205a5a3f0511b.zip
fixes #17583: only include clearfix on make-container mixin when not in flex mode
-rw-r--r--scss/mixins/_grid.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 87b4ac94a..585c80f27 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();
+ }
}