From: Mark Otto <otto@github.com>
Date: Sat, 20 Apr 2013 22:36:11 +0000 (-0700)
Subject: Only use .danger for alerts, no more .error
X-Git-Tag: v3.0.0-rc1~418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4436dbc9f328f4ad6ee391b6836b6c8d0324c2;p=thirdparty%2Fbootstrap.git

Only use .danger for alerts, no more .error
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d24999c4a9..4553a1592c 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 55e3dfb72b..e62e44661f 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 e3637ead91..ee5fc294d0 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;