aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-16 20:23:41 -0800
committerMark Otto <[email protected]>2016-02-16 20:23:41 -0800
commit6636e979d9acf253309aa57c2312ccd59ed46e54 (patch)
tree9fdb24e9dbf9f06375227bee2c5327257b5c8f94
parent57a310c3d37b66f7c17548a02547803c72ece0a7 (diff)
parentcdc0a7a748ce130335f0617753a15dda529f5f26 (diff)
downloadbootstrap-6636e979d9acf253309aa57c2312ccd59ed46e54.tar.xz
bootstrap-6636e979d9acf253309aa57c2312ccd59ed46e54.zip
Merge pull request #19211 from twbs/mark-bg-var
Add $mark-bg so <mark>'s background-color can be customized independently of $state-warning-bg
-rw-r--r--scss/_type.scss2
-rw-r--r--scss/_variables.scss1
2 files changed, 2 insertions, 1 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index 107575779..3bb355150 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -67,7 +67,7 @@ small,
mark,
.mark {
padding: .2em;
- background-color: $state-warning-bg;
+ background-color: $mark-bg;
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1482f95fe..821be6c57 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -550,6 +550,7 @@ $state-info-border: darken($state-info-bg, 7%) !default;
$state-warning-text: #8a6d3b !default;
$state-warning-bg: #fcf8e3 !default;
+$mark-bg: $state-warning-bg !default;
$state-warning-border: darken($state-warning-bg, 5%) !default;
$state-danger-text: #a94442 !default;