2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

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

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
+10 -17
View File
@@ -7,7 +7,7 @@
// -------------------------
.alert {
padding: 10px 35px 10px 15px;
padding: 15px 35px 15px 15px;
margin-bottom: @line-height-computed;
color: @alert-text;
background-color: @alert-bg;
@@ -37,6 +37,15 @@
right: -21px;
color: inherit;
}
// Improve alignment and spacing of inner content
> p,
> ul {
margin-bottom: 0;
}
> p + p {
margin-top: 5px;
}
}
// Alternate styles
@@ -51,19 +60,3 @@
.alert-info {
.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;
}
}