Commit dc4436db authored by Mark Otto's avatar Mark Otto
Browse files

Only use .danger for alerts, no more .error

parent 0c9b161b
10 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7674Clear float on all when navbar is collapsed - v3,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2
Showing with 6 additions and 11 deletions
+6 -11
......@@ -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;
}
......
......@@ -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 %}
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment