Merge pull request twbs#18851 from ju1ius/patch-1

Don't clearfix if flexbox is enabled. Fixes twbs#18849
saturnliu · Oct 28, 2016 · 2df2efc · 2df2efc
2 parents d23163a + bd62b18
commit 2df2efc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/scss/_card.scss b/scss/_card.scss
@@ -13,7 +13,9 @@
 }
 
 .card-block {
- @include clearfix;
+ @if (not $enable-flex) {
+ @include clearfix;
+ }
  padding: $card-spacer-x;
 }
 
@@ -68,7 +70,9 @@
 //
 
 .card-header {
- @include clearfix;
+ @if (not $enable-flex) {
+ @include clearfix;
+ }
  padding: $card-spacer-y $card-spacer-x;
  margin-bottom: 0; // Removes the default margin-bottom of <hN>
  background-color: $card-cap-bg;
@@ -80,7 +84,9 @@
 }
 
 .card-footer {
- @include clearfix;
+ @if (not $enable-flex) {
+ @include clearfix;
+ }
  padding: $card-spacer-y $card-spacer-x;
  background-color: $card-cap-bg;
  border-top: $card-border-width solid $card-border-color;