From: Mark Otto <markdotto@gmail.com>
Date: Tue, 8 Dec 2015 07:48:33 +0000 (-0800)
Subject: Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen... 
X-Git-Tag: v4.0.0-alpha.2~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e6d1c1ec654866588c00da9a0972f3c3b4551be;p=thirdparty%2Fbootstrap.git

Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6
---

9e6d1c1ec654866588c00da9a0972f3c3b4551be
diff --cc scss/mixins/_cards.scss
index 9541c67d4c,14b329e36c..1ce28f1ceb
--- a/scss/mixins/_cards.scss
+++ b/scss/mixins/_cards.scss
@@@ -1,6 -1,38 +1,38 @@@
  // Card variants
  
- @mixin card-variant($color) {
-   background-color: $color;
+ @mixin card-variant($background, $border) {
+   background-color: $background;
+   border-color: $border;
+ }
+ 
+ @mixin card-outline-variant($color) {
+   background-color: transparent;
    border-color: $color;
  }
+ 
+ //
+ // Inverse text within a card for use with dark backgrounds
+ //
+ 
+ @mixin card-inverse {
+   .card-header,
+   .card-footer {
 -    border-bottom: .075rem solid rgba(255,255,255,.2);
++    border-bottom: $card-border-width solid rgba(255,255,255,.2);
+   }
+   .card-header,
+   .card-footer,
+   .card-title,
+   .card-blockquote {
+     color: #fff;
+   }
+   .card-link,
+   .card-text,
+   .card-blockquote > footer {
+     color: rgba(255,255,255,.65);
+   }
+   .card-link {
+     @include hover-focus {
 -      color: #fff;
++      color: $card-link-hover-color;
+     }
+   }
+ }