aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-27 21:58:14 -0700
committerGitHub <[email protected]>2016-10-27 21:58:14 -0700
commit2df2efc1fbee2a152b5347c7d8e9651f1c1c2265 (patch)
treee402503c9ae12e0e4fcdf01559432f49f4213290
parentd23163a48393774ebd3c7ac7da4251d8b1c193f1 (diff)
parentbd62b185f6de341baeb9eee228dc602f4d613340 (diff)
downloadbootstrap-2df2efc1fbee2a152b5347c7d8e9651f1c1c2265.tar.xz
bootstrap-2df2efc1fbee2a152b5347c7d8e9651f1c1c2265.zip
Merge pull request #18851 from ju1ius/patch-1
Don't clearfix if flexbox is enabled. Fixes #18849
-rw-r--r--scss/_card.scss12
1 files changed, 9 insertions, 3 deletions
diff --git a/scss/_card.scss b/scss/_card.scss
index 01a5733d6..23a5e07c7 100644
--- 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;