From: Mark Otto <markd.otto@gmail.com>
Date: Fri, 28 Oct 2016 04:58:14 +0000 (-0700)
Subject: Merge pull request #18851 from ju1ius/patch-1
X-Git-Tag: v4.0.0-alpha.6~479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2df2efc1fbee2a152b5347c7d8e9651f1c1c2265;p=thirdparty%2Fbootstrap.git

Merge pull request #18851 from ju1ius/patch-1

Don't clearfix if flexbox is enabled. Fixes #18849
---

2df2efc1fbee2a152b5347c7d8e9651f1c1c2265
diff --cc scss/_card.scss
index 01a5733d6a,646a281582..23a5e07c72
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@@ -68,9 -71,10 +70,11 @@@
  //
  
  .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;
    border-bottom: $card-border-width solid $card-border-color;