]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fixes #5940: Prevent @headingsColor from changing alert colors
authorMark Otto <otto@github.com>
Wed, 28 Nov 2012 09:48:34 +0000 (01:48 -0800)
committerMark Otto <otto@github.com>
Wed, 28 Nov 2012 09:48:34 +0000 (01:48 -0800)
docs/assets/css/bootstrap.css
less/alerts.less

index 9eee6fa0ca18f6848c95846de5da3fd262eeb864..9c343dc172c3b9cff5f0715038e30b1e6f60c05f 100644 (file)
@@ -3803,7 +3803,6 @@ input[type="submit"].btn.btn-mini {
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: 20px;
-  color: #c09853;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #fcf8e3;
   border: 1px solid #fbeed5;
@@ -3812,6 +3811,11 @@ input[type="submit"].btn.btn-mini {
           border-radius: 4px;
 }
 
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
 .alert h4 {
   margin: 0;
 }
index 9abb226d6bc6e0ace3d51818959561f8c5ad5869..37e50f9038c2b07944c8457043cb4d9760325e84 100644 (file)
   background-color: @warningBackground;
   border: 1px solid @warningBorder;
   .border-radius(@baseBorderRadius);
+}
+.alert,
+.alert h4 {
+  // Specified for the h4 to prevent conflicts of changing @headingsColor
   color: @warningText;
 }
 .alert h4 {