mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Only use .danger for alerts, no more .error

Browse Source
This commit is contained in:
Mark Otto 2013-04-20 15:36:11 -07:00
parent 0c9b161bb8
commit dc4436dbc9
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4663,22 +4663,18 @@ button.close {
color: #356635; color: #356635;
} }
.alert-danger, .alert-danger {
.alert-error {
color: #b94a48; color: #b94a48;
background-color: #f2dede; background-color: #f2dede;
border-color: #eed3d7; border-color: #eed3d7;
} }
.alert-danger hr, .alert-danger hr {
.alert-error hr {
border-top-color: #e6c1c7; border-top-color: #e6c1c7;
} }
.alert-danger > a, .alert-danger > a,
.alert-error > a, .alert-danger > p > a {
.alert-danger > p > a,
.alert-error > p > a {
color: #953b39; color: #953b39;
} }

4
docs/docs.html
View File

@ -4246,7 +4246,7 @@ body {
<h3 id="alerts-alternatives">Contextual alternatives</h3> <h3 id="alerts-alternatives">Contextual alternatives</h3>
<p>Add optional classes to change an alert's connotation.</p> <p>Add optional classes to change an alert's connotation.</p>
<div class="bs-docs-example"> <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> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Oh snap!</strong> Change a few things up and try submitting again. <strong>Oh snap!</strong> Change a few things up and try submitting again.
</div> </div>
@ -4260,7 +4260,7 @@ body {
</div> </div>
</div> </div>
{% highlight html linenos %} {% 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-success">...</div>
<div class="alert alert-info">...</div> <div class="alert alert-info">...</div>
{% endhighlight %} {% endhighlight %}

3
less/alerts.less
View File

@ -55,8 +55,7 @@
color: darken(@state-success-text, 10%); color: darken(@state-success-text, 10%);
} }
} }
.alert-danger, .alert-danger {
.alert-error {
background-color: @state-danger-bg; background-color: @state-danger-bg;
border-color: @state-danger-border; border-color: @state-danger-border;
color: @state-danger-text; color: @state-danger-text;