diff options
| author | Mark Otto <[email protected]> | 2013-08-02 09:32:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 09:32:58 -0700 |
| commit | d0b94ead9a660adeca599b2cc49ce5134d432f2f (patch) | |
| tree | 23f4abb019f22bfc033f4c8e61e9ca96118c0dfb /less | |
| parent | 21be3efad3b1392ebc15acf082cbf3ae83437420 (diff) | |
| download | bootstrap-d0b94ead9a660adeca599b2cc49ce5134d432f2f.tar.xz bootstrap-d0b94ead9a660adeca599b2cc49ce5134d432f2f.zip | |
Fix #9008: consolidate `.alert-block` styles into `.alert`
Diffstat (limited to 'less')
| -rw-r--r-- | less/alerts.less | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/less/alerts.less b/less/alerts.less index 66aa6cf24..f7ba9ba1c 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -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; - } -} |