mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 17:11:48 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-14 16:24:39 -07:00
parent 4d527ec316 8e8fe8de93
commit a9d6b7ee0b
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dist/css/bootstrap.css vendored
View File

@@ -2719,17 +2719,17 @@ a.list-group-item:focus {
border-color: #428bca;
}
.panel-primary .panel-heading {
.panel-primary > .panel-heading {
color: #ffffff;
background-color: #428bca;
border-color: #428bca;
}
.panel-primary .panel-heading + .panel-collapse .panel-body {
.panel-primary > .panel-heading + .panel-collapse .panel-body {
border-top-color: #428bca;
}
.panel-primary .panel-footer + .panel-collapse .panel-body {
.panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca;
}
@@ -2737,17 +2737,17 @@ a.list-group-item:focus {
border-color: #d6e9c6;
}
.panel-success .panel-heading {
.panel-success > .panel-heading {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.panel-success .panel-heading + .panel-collapse .panel-body {
.panel-success > .panel-heading + .panel-collapse .panel-body {
border-top-color: #d6e9c6;
}
.panel-success .panel-footer + .panel-collapse .panel-body {
.panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6;
}
@@ -2755,17 +2755,17 @@ a.list-group-item:focus {
border-color: #fbeed5;
}
.panel-warning .panel-heading {
.panel-warning > .panel-heading {
color: #c09853;
background-color: #fcf8e3;
border-color: #fbeed5;
}
.panel-warning .panel-heading + .panel-collapse .panel-body {
.panel-warning > .panel-heading + .panel-collapse .panel-body {
border-top-color: #fbeed5;
}
.panel-warning .panel-footer + .panel-collapse .panel-body {
.panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5;
}
@@ -2773,17 +2773,17 @@ a.list-group-item:focus {
border-color: #eed3d7;
}
.panel-danger .panel-heading {
.panel-danger > .panel-heading {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.panel-danger .panel-heading + .panel-collapse .panel-body {
.panel-danger > .panel-heading + .panel-collapse .panel-body {
border-top-color: #eed3d7;
}
.panel-danger .panel-footer + .panel-collapse .panel-body {
.panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #eed3d7;
}
@@ -2791,17 +2791,17 @@ a.list-group-item:focus {
border-color: #bce8f1;
}
.panel-info .panel-heading {
.panel-info > .panel-heading {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
.panel-info .panel-heading + .panel-collapse .panel-body {
.panel-info > .panel-heading + .panel-collapse .panel-body {
border-top-color: #bce8f1;
}
.panel-info .panel-footer + .panel-collapse .panel-body {
.panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1;
}
@@ -3878,6 +3878,7 @@ button.close {
.btn-group-justified {
display: table;
width: 100%;
border-collapse: separate;
table-layout: fixed;
}

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

File diff suppressed because one or more lines are too long