]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #18356 from lesleh/card-mixin
authorMark Otto <markd.otto@gmail.com>
Tue, 8 Dec 2015 05:55:26 +0000 (21:55 -0800)
committerMark Otto <markd.otto@gmail.com>
Tue, 8 Dec 2015 05:55:26 +0000 (21:55 -0800)
Card mixin

1  2 
scss/_card.scss
scss/_mixins.scss

diff --cc scss/_card.scss
Simple merge
index 9378ff785e667ad9b62233ad0caca0e805e27e43,75a4c929333716dc4afc513cc7c6c9d9ad7fbb7d..934769fdcdd0279b327ba3492933e08cc9fb51d1
@@@ -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";