aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-31 20:46:29 -0700
committerMark Otto <[email protected]>2017-05-31 20:46:29 -0700
commit332d882cdbb541f1f6d5b781b1454f84bb0c8ad2 (patch)
tree3a399416a628c04232680a477273cf2eb301dca5 /scss
parentcb9f181d0eacc31ec95dd5a80871e5911bbab72c (diff)
parent0800c7e1c81c3a5950330478fa495512cf3a5d64 (diff)
downloadbootstrap-332d882cdbb541f1f6d5b781b1454f84bb0c8ad2.tar.xz
bootstrap-332d882cdbb541f1f6d5b781b1454f84bb0c8ad2.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'scss')
-rw-r--r--scss/_variables.scss2
-rw-r--r--scss/mixins/_cards.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 20826e8e0..74e2fab73 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -677,7 +677,7 @@ $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width})
$card-cap-bg: $gray-lightest !default;
$card-bg: $white !default;
-$card-link-hover-color: $white !default;
+$card-inverse-link-hover-color: $white !default;
$card-img-overlay-padding: 1.25rem !default;
diff --git a/scss/mixins/_cards.scss b/scss/mixins/_cards.scss
index e535b316d..c32ca689e 100644
--- a/scss/mixins/_cards.scss
+++ b/scss/mixins/_cards.scss
@@ -47,7 +47,7 @@
}
.card-link {
@include hover-focus {
- color: $card-link-hover-color;
+ color: $card-inverse-link-hover-color;
}
}
}