diff options
| author | Mark Otto <[email protected]> | 2016-10-18 23:42:16 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-18 23:42:16 -0700 |
| commit | 16947ffa88ee18f0ca7cd44ac9493c15bf894fbb (patch) | |
| tree | 32c1d7b9cd4de6df0bacf6f10d819df1c4ff2262 | |
| parent | 154373889085c501c1eedf8402d82ab35a7cd687 (diff) | |
| parent | 6321f9342e64d43390d44c8fee08d7354985750e (diff) | |
| download | bootstrap-16947ffa88ee18f0ca7cd44ac9493c15bf894fbb.tar.xz bootstrap-16947ffa88ee18f0ca7cd44ac9493c15bf894fbb.zip | |
Merge pull request #20933 from twbs/alert-padding-vars
Switch to separate vars for alert vertical/horizontal padding
| -rw-r--r-- | scss/_alert.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scss/_alert.scss b/scss/_alert.scss index 433177101..260ce2034 100644 --- a/scss/_alert.scss +++ b/scss/_alert.scss @@ -3,7 +3,7 @@ // .alert { - padding: $alert-padding; + padding: $alert-padding-y $alert-padding-x; margin-bottom: $spacer-y; border: $alert-border-width solid transparent; @include border-radius($alert-border-radius); @@ -26,13 +26,13 @@ // Expand the right padding and account for the close button's positioning. .alert-dismissible { - padding-right: ($alert-padding * 2); + padding-right: ($alert-padding-x * 2); // Adjust close link position .close { position: relative; top: -.125rem; - right: -$alert-padding; + right: -$alert-padding-x; color: inherit; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index c1bcbdc2c..b5ca86f3d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -701,7 +701,8 @@ $modal-sm: 300px !default; // // Define alert colors, border radius, and padding. -$alert-padding: 1rem !default; +$alert-padding-x: 1.25rem !default; +$alert-padding-y: .75rem !default; $alert-border-radius: $border-radius !default; $alert-link-font-weight: bold !default; $alert-border-width: $border-width !default; |