aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-20 15:36:11 -0700
committerMark Otto <[email protected]>2013-04-20 15:36:11 -0700
commitdc4436dbc9f328f4ad6ee391b6836b6c8d0324c2 (patch)
tree9f6ed2bc4a30bc0d3757af5145abd0960670f82a
parent0c9b161bb889a5f47f7ef0752d90c41c9f957695 (diff)
downloadbootstrap-dc4436dbc9f328f4ad6ee391b6836b6c8d0324c2.tar.xz
bootstrap-dc4436dbc9f328f4ad6ee391b6836b6c8d0324c2.zip
Only use .danger for alerts, no more .error
-rw-r--r--docs/assets/css/bootstrap.css10
-rw-r--r--docs/docs.html4
-rw-r--r--less/alerts.less3
3 files changed, 6 insertions, 11 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d24999c4a..4553a1592 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4663,22 +4663,18 @@ button.close {
color: #356635;
}
-.alert-danger,
-.alert-error {
+.alert-danger {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
-.alert-danger hr,
-.alert-error hr {
+.alert-danger hr {
border-top-color: #e6c1c7;
}
.alert-danger > a,
-.alert-error > a,
-.alert-danger > p > a,
-.alert-error > p > a {
+.alert-danger > p > a {
color: #953b39;
}
diff --git a/docs/docs.html b/docs/docs.html
index 55e3dfb72..e62e44661 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -4246,7 +4246,7 @@ body {
<h3 id="alerts-alternatives">Contextual alternatives</h3>
<p>Add optional classes to change an alert's connotation.</p>
<div class="bs-docs-example">
- <div class="alert alert-error">
+ <div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Oh snap!</strong> Change a few things up and try submitting again.
</div>
@@ -4260,7 +4260,7 @@ body {
</div>
</div>
{% highlight html linenos %}
-<div class="alert alert-error">...</div>
+<div class="alert alert-danger">...</div>
<div class="alert alert-success">...</div>
<div class="alert alert-info">...</div>
{% endhighlight %}
diff --git a/less/alerts.less b/less/alerts.less
index e3637ead9..ee5fc294d 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -55,8 +55,7 @@
color: darken(@state-success-text, 10%);
}
}
-.alert-danger,
-.alert-error {
+.alert-danger {
background-color: @state-danger-bg;
border-color: @state-danger-border;
color: @state-danger-text;