aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-11-12 23:50:51 -0800
committerMark Otto <[email protected]>2015-11-12 23:50:51 -0800
commitcbb5e2548263edcf904d75ad06747b7e69834fc8 (patch)
tree5e25cee62917792f6e347f19014123efc15560be
parent5abd4e01422f9c35523fbea4914347ec02a9cd73 (diff)
parentbe1bb9ec3efb202b6f99b8e2ac12fef4587a50ec (diff)
downloadbootstrap-cbb5e2548263edcf904d75ad06747b7e69834fc8.tar.xz
bootstrap-cbb5e2548263edcf904d75ad06747b7e69834fc8.zip
Merge pull request #17939 from chrisbell08/#17895_alert_border_width
#17895 Added $alert-border-width that defaults to $border-width
-rw-r--r--scss/_alert.scss2
-rw-r--r--scss/_variables.scss1
2 files changed, 2 insertions, 1 deletions
diff --git a/scss/_alert.scss b/scss/_alert.scss
index 8e550d8f7..b9f6c60da 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -5,7 +5,7 @@
.alert {
padding: $alert-padding;
margin-bottom: $spacer-y;
- border: 1px solid transparent;
+ border: $alert-border-width solid transparent;
@include border-radius($alert-border-radius);
// Improve alignment and spacing of inner content
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 74f05a2a7..b7bb88090 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -526,6 +526,7 @@ $modal-sm: 300px !default;
$alert-padding: 15px !default;
$alert-border-radius: $border-radius !default;
$alert-link-font-weight: bold !default;
+$alert-border-width: $border-width !default;
$alert-success-bg: $state-success-bg !default;
$alert-success-text: $state-success-text !default;