Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-11-28 13:48:34 +0400
committerMark Otto <otto@github.com>2012-11-28 13:48:34 +0400
commit014d3cedf5f92e9b9f246cef2c639b2845e6741f (patch)
tree9105b14ae74ff6d9d72c430d96e6a84f1b9e4b5a
parentbfc97fdaf6cefceb4091e745977b5bac2ffda1c7 (diff)
Fixes #5940: Prevent @headingsColor from changing alert colors
-rw-r--r--docs/assets/css/bootstrap.css6
-rw-r--r--less/alerts.less4
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9eee6fa0ca..9c343dc172 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
}
diff --git a/less/alerts.less b/less/alerts.less
index 9abb226d6b..37e50f9038 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -13,6 +13,10 @@
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 {