aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-18 20:10:14 -0700
committerMark Otto <[email protected]>2013-08-18 20:10:14 -0700
commit2e9184366129139bb9b64b679a0e75a3c556465e (patch)
treedf224538a837a3701f088d1283caa0afaf10c074 /dist/css/bootstrap.css
parent93887f4bd001005e75ef636ef7600c6bcc9a61f4 (diff)
parente6ff75bcea01a75306e7a747103b0647bec909af (diff)
downloadbootstrap-2e9184366129139bb9b64b679a0e75a3c556465e.tar.xz
bootstrap-2e9184366129139bb9b64b679a0e75a3c556465e.zip
Merge pull request #9818 from twbs/bs3_alert_base_class
BS3: Refactor alerts to require a modifier class
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css51
1 files changed, 29 insertions, 22 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 6ce593647..6cbf85136 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4935,9 +4935,7 @@ a.thumbnail:focus {
.alert {
padding: 15px;
margin-bottom: 20px;
- color: #c09853;
- background-color: #fcf8e3;
- border: 1px solid #fbeed5;
+ border: 1px solid transparent;
border-radius: 4px;
}
@@ -4946,13 +4944,8 @@ a.thumbnail:focus {
color: inherit;
}
-.alert hr {
- border-top-color: #f8e5be;
-}
-
.alert .alert-link {
font-weight: bold;
- color: #a47e3c;
}
.alert > p,
@@ -4989,20 +4982,6 @@ a.thumbnail:focus {
color: #356635;
}
-.alert-danger {
- color: #b94a48;
- background-color: #f2dede;
- border-color: #eed3d7;
-}
-
-.alert-danger hr {
- border-top-color: #e6c1c7;
-}
-
-.alert-danger .alert-link {
- color: #953b39;
-}
-
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
@@ -5017,6 +4996,34 @@ a.thumbnail:focus {
color: #2d6987;
}
+.alert-warning {
+ color: #c09853;
+ background-color: #fcf8e3;
+ border-color: #fbeed5;
+}
+
+.alert-warning hr {
+ border-top-color: #f8e5be;
+}
+
+.alert-warning .alert-link {
+ color: #a47e3c;
+}
+
+.alert-danger {
+ color: #b94a48;
+ background-color: #f2dede;
+ border-color: #eed3d7;
+}
+
+.alert-danger hr {
+ border-top-color: #e6c1c7;
+}
+
+.alert-danger .alert-link {
+ color: #953b39;
+}
+
@-webkit-keyframes progress-bar-stripes {
from {
background-position: 40px 0;