0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge pull request #20933 from twbs/alert-padding-vars

Switch to separate vars for alert vertical/horizontal padding
This commit is contained in:
Mark Otto 2016-10-18 23:42:16 -07:00 committed by GitHub
commit 16947ffa88
2 changed files with 5 additions and 4 deletions

View File

@ -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;
}
}

View File

@ -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;