aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-16 20:23:22 -0800
committerMark Otto <[email protected]>2016-02-16 20:23:22 -0800
commit57a310c3d37b66f7c17548a02547803c72ece0a7 (patch)
tree61e3ebebeba50f7911b3d4d938ba58d0289df74c
parentca77f52875b64abe0c2682c62084ffe24a78b1d6 (diff)
parent2c034cf5423e942ca47b632f60305522b4612898 (diff)
downloadbootstrap-57a310c3d37b66f7c17548a02547803c72ece0a7.tar.xz
bootstrap-57a310c3d37b66f7c17548a02547803c72ece0a7.zip
Merge pull request #19214 from twbs/label-font-size
Add $label-font-size variable in the name of not hardcoding values
-rw-r--r--scss/_labels.scss2
-rw-r--r--scss/_variables.scss1
2 files changed, 2 insertions, 1 deletions
diff --git a/scss/_labels.scss b/scss/_labels.scss
index 8d758ac89..ef065bec3 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -6,7 +6,7 @@
.label {
display: inline-block;
padding: $label-padding-y $label-padding-x;
- font-size: 75%;
+ font-size: $label-font-size;
font-weight: $label-font-weight;
line-height: 1;
color: $label-color;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 500a3d593..1482f95fe 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -619,6 +619,7 @@ $label-danger-bg: $brand-danger !default;
$label-color: #fff !default;
$label-link-hover-color: #fff !default;
+$label-font-size: 75% !default;
$label-font-weight: bold !default;
$label-padding-x: .4em !default;
$label-padding-y: .25em !default;