kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Fix #9008: consolidate .alert-block styles into .alert

Browse source
This commit is contained in:
Mark Otto 2013-08-02 09:32:58 -07:00
parent 21be3efad3
commit d0b94ead9a
5 changed files with 21 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
_includes/nav-components.html
View file

@ -85,7 +85,6 @@
<a href="#alerts">Alerts</a> <a href="#alerts">Alerts</a>
<ul class="nav"> <ul class="nav">
<li><a href="#alerts-default">Default alert</a></li> <li><a href="#alerts-default">Default alert</a></li>
<li><a href="#alerts-block">Block alerts</a></li>
<li><a href="#alerts-alternatives">Contextual alternatives</a></li> <li><a href="#alerts-alternatives">Contextual alternatives</a></li>
<li><a href="#alerts-links">Links in alerts</a></li> <li><a href="#alerts-links">Links in alerts</a></li>
</ul> </ul>

17
components.html
View file

@ -1813,23 +1813,6 @@ body { padding-bottom: 70px; }
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Warning!</strong> Best check yo self, you're not looking too good. <strong>Warning!</strong> Best check yo self, you're not looking too good.
</div> </div>
{% endhighlight %}
<h3 id="alerts-block">Block alerts</h3>
<p>For longer messages, increase the padding on the top and bottom of the alert wrapper by adding <code>.alert-block</code>.</p>
<div class="bs-example">
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<h4>Warning!</h4>
<p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
</div>
</div>
{% highlight html %}
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<h4>Warning!</h4>
<p>...</p>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="alerts-alternatives">Contextual alternatives</h3> <h3 id="alerts-alternatives">Contextual alternatives</h3>

25
dist/css/bootstrap.css vendored
View file

@ -3751,7 +3751,7 @@ button.close {
} }
.alert { .alert {
padding: 10px 35px 10px 15px; padding: 15px 35px 15px 15px;
margin-bottom: 20px; margin-bottom: 20px;
color: #c09853; color: #c09853;
background-color: #fcf8e3; background-color: #fcf8e3;
@ -3780,6 +3780,15 @@ button.close {
color: inherit; color: inherit;
} }
.alert > p,
.alert > ul {
margin-bottom: 0;
}
.alert > p + p {
margin-top: 5px;
}
.alert-success { .alert-success {
color: #468847; color: #468847;
background-color: #dff0d8; background-color: #dff0d8;
@ -3822,20 +3831,6 @@ button.close {
color: #2d6987; color: #2d6987;
} }
.alert-block {
padding-top: 15px;
padding-bottom: 15px;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
}
.thumbnail, .thumbnail,
.img-thumbnail { .img-thumbnail {
padding: 4px; padding: 4px;

2
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

27
less/alerts.less
View file

@ -7,7 +7,7 @@
// ------------------------- // -------------------------
.alert { .alert {
padding: 10px 35px 10px 15px; padding: 15px 35px 15px 15px;
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
color: @alert-text; color: @alert-text;
background-color: @alert-bg; background-color: @alert-bg;
@ -37,6 +37,15 @@
right: -21px; right: -21px;
color: inherit; color: inherit;
} }
// Improve alignment and spacing of inner content
> p,
> ul {
margin-bottom: 0;
}
> p + p {
margin-top: 5px;
}
} }
// Alternate styles // Alternate styles
@ -51,19 +60,3 @@
.alert-info { .alert-info {
.alert-variant(@alert-info-bg, @alert-info-border, @alert-info-text); .alert-variant(@alert-info-bg, @alert-info-border, @alert-info-text);
} }
// Block alerts
// -------------------------
.alert-block {
padding-top: 15px;
padding-bottom: 15px;
> p,
> ul {
margin-bottom: 0;
}
p + p {
margin-top: 5px;
}
}