aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-02-16 00:31:14 -0800
committerChris Rebert <[email protected]>2016-02-16 00:31:14 -0800
commit5f455319e206dc4f29249d34f5592037a179cf87 (patch)
tree1ec5e6023173528f901f624ebbb233eebe22c8c4
parent8358471aa5312d1aea67d1fd2ab8da39f930b7cd (diff)
parentc80cf45960c4d5c9719b8e9462d9b86eaa8d6c6b (diff)
downloadbootstrap-5f455319e206dc4f29249d34f5592037a179cf87.tar.xz
bootstrap-5f455319e206dc4f29249d34f5592037a179cf87.zip
Merge pull request #19213 from twbs/label-pill-padding-x
Extract $label-pill-padding-x variable
-rw-r--r--scss/_labels.scss4
-rw-r--r--scss/_variables.scss1
2 files changed, 3 insertions, 2 deletions
diff --git a/scss/_labels.scss b/scss/_labels.scss
index fb4ef5aef..66af7c9c9 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -43,8 +43,8 @@ a.label {
// Make them extra rounded with a modifier to replace v3's badges.
.label-pill {
- padding-right: .6em;
- padding-left: .6em;
+ 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);
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 77e60ff71..5c92cb21d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -622,6 +622,7 @@ $label-font-weight: bold !default;
$label-padding-x: .4em !default;
$label-padding-y: .25em !default;
+$label-pill-padding-x: .6em !default;
// Modals