From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 8 Dec 2015 05:55:26 +0000 (-0800)
Subject: Merge pull request #18356 from lesleh/card-mixin
X-Git-Tag: v4.0.0-alpha.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5b692225846d7d1d6feb7de2a73f1608d2a0731;p=thirdparty%2Fbootstrap.git

Merge pull request #18356 from lesleh/card-mixin

Card mixin
---

e5b692225846d7d1d6feb7de2a73f1608d2a0731
diff --cc scss/_mixins.scss
index 9378ff785e,75a4c92933..934769fdcd
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@@ -32,8 -38,8 +32,9 @@@
  // // Components
  @import "mixins/alert";
  @import "mixins/buttons";
+ @import "mixins/cards";
  @import "mixins/pagination";
 +@import "mixins/lists";
  @import "mixins/list-group";
  @import "mixins/nav-divider";
  @import "mixins/forms";