aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-16 20:23:03 -0800
committerMark Otto <[email protected]>2016-02-16 20:23:03 -0800
commitca77f52875b64abe0c2682c62084ffe24a78b1d6 (patch)
tree926ac4c5caf226d82758d7d5d8acaf63d7a5b3c4
parent60f83096f1159037ed8d0c2c9b986d2d4b4017e2 (diff)
parent08d23959ac6dc21576442b5e1f89714cb482d6b2 (diff)
downloadbootstrap-ca77f52875b64abe0c2682c62084ffe24a78b1d6.tar.xz
bootstrap-ca77f52875b64abe0c2682c62084ffe24a78b1d6.zip
Merge pull request #19215 from twbs/label-pill-border-radius
Add $label-pill-border-radius variable
-rw-r--r--scss/_labels.scss4
-rw-r--r--scss/_variables.scss3
2 files changed, 4 insertions, 3 deletions
diff --git a/scss/_labels.scss b/scss/_labels.scss
index 66af7c9c9..8d758ac89 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -45,9 +45,7 @@ a.label {
.label-pill {
padding-right: $label-pill-padding-x;
padding-left: $label-pill-padding-x;
- // Use a higher than normal value to ensure completely rounded edges when
- // customizing padding or font-size on labels.
- @include border-radius(10rem);
+ @include border-radius($label-pill-border-radius);
}
// Colors
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d584377f7..500a3d593 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -624,6 +624,9 @@ $label-padding-x: .4em !default;
$label-padding-y: .25em !default;
$label-pill-padding-x: .6em !default;
+// Use a higher than normal value to ensure completely rounded edges when
+// customizing padding or font-size on labels.
+$label-pill-border-radius: 10rem !default;
// Modals