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

Use inherit on alert-heading color

Browse Source 
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
This commit is contained in:
Jacob Rask 2012-02-19 21:29:32 +01:00
parent ac6e667ad9
commit 51ec513b5c
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

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

@ -2132,10 +2132,11 @@ button.btn.small, input[type="submit"].btn.small {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.alert, .alert-heading {
color: #c09853;
}
.alert-heading {
color: inherit;
}
.alert .close {
position: relative;
top: -2px;
@ -2145,25 +2146,16 @@ button.btn.small, input[type="submit"].btn.small {
.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert-success, .alert-success .alert-heading {
color: #468847;
}
.alert-danger, .alert-error {
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger,
.alert-error,
.alert-danger .alert-heading,
.alert-error .alert-heading {
color: #b94a48;
}
.alert-info {
background-color: #d9edf7;
border-color: #bce8f1;
}
.alert-info, .alert-info .alert-heading {
color: #3a87ad;
}
.alert-block {

18
less/alerts.less
View File

@ -9,11 +9,11 @@
background-color: @warningBackground;
border: 1px solid @warningBorder;
.border-radius(4px);
}
.alert,
.alert-heading {
color: @warningText;
}
.alert-heading {
color: inherit;
}
// Adjust close link position
.alert .close {
@ -29,32 +29,20 @@
.alert-success {
background-color: @successBackground;
border-color: @successBorder;
}
.alert-success,
.alert-success .alert-heading {
color: @successText;
}
.alert-danger,
.alert-error {
background-color: @errorBackground;
border-color: @errorBorder;
}
.alert-danger,
.alert-error,
.alert-danger .alert-heading,
.alert-error .alert-heading {
color: @errorText;
}
.alert-info {
background-color: @infoBackground;
border-color: @infoBorder;
}
.alert-info,
.alert-info .alert-heading {
color: @infoText;
}
// Block alerts
// ------------------------
.alert-block {