rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Fixes #5940: Prevent @headingsColor from changing alert colors

Browse Source
This commit is contained in:
Mark Otto 2012-11-28 01:48:34 -08:00
parent bfc97fdaf6
commit 014d3cedf5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -3803,7 +3803,6 @@ input[type="submit"].btn.btn-mini {
.alert { .alert {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: 20px; margin-bottom: 20px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3; background-color: #fcf8e3;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
@ -3812,6 +3811,11 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px; border-radius: 4px;
} }
.alert,
.alert h4 {
color: #c09853;
}
.alert h4 { .alert h4 {
margin: 0; margin: 0;
} }

4
less/alerts.less
View File

@ -13,6 +13,10 @@
background-color: @warningBackground; background-color: @warningBackground;
border: 1px solid @warningBorder; border: 1px solid @warningBorder;
.border-radius(@baseBorderRadius); .border-radius(@baseBorderRadius);
}
.alert,
.alert h4 {
// Specified for the h4 to prevent conflicts of changing @headingsColor
color: @warningText; color: @warningText;
} }
.alert h4 { .alert h4 {