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

Merge pull request #17939 from chrisbell08/#17895_alert_border_width

#17895 Added $alert-border-width that defaults to $border-width
This commit is contained in:
Mark Otto 2015-11-12 23:50:51 -08:00
commit cbb5e25482
2 changed files with 2 additions and 1 deletions

View File

@ -5,7 +5,7 @@
.alert { .alert {
padding: $alert-padding; padding: $alert-padding;
margin-bottom: $spacer-y; margin-bottom: $spacer-y;
border: 1px solid transparent; border: $alert-border-width solid transparent;
@include border-radius($alert-border-radius); @include border-radius($alert-border-radius);
// Improve alignment and spacing of inner content // Improve alignment and spacing of inner content

View File

@ -526,6 +526,7 @@ $modal-sm: 300px !default;
$alert-padding: 15px !default; $alert-padding: 15px !default;
$alert-border-radius: $border-radius !default; $alert-border-radius: $border-radius !default;
$alert-link-font-weight: bold !default; $alert-link-font-weight: bold !default;
$alert-border-width: $border-width !default;
$alert-success-bg: $state-success-bg !default; $alert-success-bg: $state-success-bg !default;
$alert-success-text: $state-success-text !default; $alert-success-text: $state-success-text !default;