mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 23:59:53 +02:00
Code Issues Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files

25
dist/css/bootstrap.css vendored
View File

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

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

File diff suppressed because one or more lines are too long