Merge pull request #18851 from ju1ius/patch-1

Don't clearfix if flexbox is enabled. Fixes #18849
This commit is contained in:
Mark Otto 2016-10-27 21:58:14 -07:00 committed by GitHub
commit 2df2efc1fb

View file

@ -13,7 +13,9 @@
} }
.card-block { .card-block {
@include clearfix; @if (not $enable-flex) {
@include clearfix;
}
padding: $card-spacer-x; padding: $card-spacer-x;
} }
@ -68,7 +70,9 @@
// //
.card-header { .card-header {
@include clearfix; @if (not $enable-flex) {
@include clearfix;
}
padding: $card-spacer-y $card-spacer-x; padding: $card-spacer-y $card-spacer-x;
margin-bottom: 0; // Removes the default margin-bottom of <hN> margin-bottom: 0; // Removes the default margin-bottom of <hN>
background-color: $card-cap-bg; background-color: $card-cap-bg;
@ -80,7 +84,9 @@
} }
.card-footer { .card-footer {
@include clearfix; @if (not $enable-flex) {
@include clearfix;
}
padding: $card-spacer-y $card-spacer-x; padding: $card-spacer-y $card-spacer-x;
background-color: $card-cap-bg; background-color: $card-cap-bg;
border-top: $card-border-width solid $card-border-color; border-top: $card-border-width solid $card-border-color;