aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-12-06 16:24:31 -0800
committerMark Otto <[email protected]>2015-12-06 16:24:31 -0800
commit873a9409a382ba5c0c07a7f7b18b92c0bd282973 (patch)
tree1b75bc0fc8f899506d2b410f759019a0a0de3a7b
parent451265bb7618714627153263650e566d8369c74c (diff)
parent0759d76bd28920e0fa58d4cd497385b6c1684563 (diff)
downloadbootstrap-873a9409a382ba5c0c07a7f7b18b92c0bd282973.tar.xz
bootstrap-873a9409a382ba5c0c07a7f7b18b92c0bd282973.zip
Merge pull request #18450 from twbs/more-font-weight-vars
Add 3 more font-weight variables
-rw-r--r--scss/_code.scss2
-rw-r--r--scss/_labels.scss2
-rw-r--r--scss/_reboot.scss2
-rw-r--r--scss/_variables.scss5
4 files changed, 8 insertions, 3 deletions
diff --git a/scss/_code.scss b/scss/_code.scss
index 0de67d9ec..60bbcae81 100644
--- a/scss/_code.scss
+++ b/scss/_code.scss
@@ -27,7 +27,7 @@ kbd {
kbd {
padding: 0;
font-size: 100%;
- font-weight: bold;
+ font-weight: $nested-kbd-font-weight;
@include box-shadow(none);
}
}
diff --git a/scss/_labels.scss b/scss/_labels.scss
index 8b2f0f82a..c58ddde17 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -7,7 +7,7 @@
display: inline-block;
padding: .25em .4em;
font-size: 75%;
- font-weight: bold;
+ font-weight: $label-font-weight;
line-height: 1;
color: $label-color;
text-align: center;
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 585adc3c6..ba389b36d 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -129,7 +129,7 @@ ul ol {
}
dt {
- font-weight: bold;
+ font-weight: $dt-font-weight;
}
dd {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 38f257684..9400d1bd6 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -176,6 +176,10 @@ $blockquote-border-color: $gray-lighter !default;
$hr-border-color: rgba(0,0,0,.1) !default;
$hr-border-width: $border-width !default;
+$dt-font-weight: bold !default;
+
+$nested-kbd-font-weight: bold !default;
+
// Components
//
@@ -501,6 +505,7 @@ $label-danger-bg: $brand-danger !default;
$label-color: #fff !default;
$label-link-hover-color: #fff !default;
+$label-font-weight: bold !default;
// Modals