aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Rask <[email protected]>2012-02-19 21:29:32 +0100
committerJacob Rask <[email protected]>2012-02-19 21:29:32 +0100
commit51ec513b5c50123761350d2bcd27dafb07192a7e (patch)
tree936a59e4be0244dfe22b2c11190f8077c490b88d
parentac6e667ad9ae57c5caa977fd6593a2299887737a (diff)
downloadbootstrap-51ec513b5c50123761350d2bcd27dafb07192a7e.tar.xz
bootstrap-51ec513b5c50123761350d2bcd27dafb07192a7e.zip
Use inherit on alert-heading color
Heading then inherits from the parent alert. Avoids a lot of extra unneccessary CSS.
-rw-r--r--docs/assets/bootstrap.zipbin53408 -> 53373 bytes
-rw-r--r--docs/assets/css/bootstrap.css14
-rw-r--r--less/alerts.less16
3 files changed, 5 insertions, 25 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index df4dc7ff2..069727cf0 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 71ab7a9d4..4e80a1836 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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 {
diff --git a/less/alerts.less b/less/alerts.less
index 562826fd3..46a0d77bf 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -9,10 +9,10 @@
background-color: @warningBackground;
border: 1px solid @warningBorder;
.border-radius(4px);
+ color: @warningText;
}
-.alert,
.alert-heading {
- color: @warningText;
+ color: inherit;
}
// Adjust close link position
@@ -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 {