rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-14 15:33:38 -07:00
commit 0086761660
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dist/css/bootstrap.css vendored
View File

@ -2712,17 +2712,17 @@ a.list-group-item:focus {
border-color: #428bca; border-color: #428bca;
} }
.panel-primary .panel-heading { .panel-primary > .panel-heading {
color: #ffffff; color: #ffffff;
background-color: #428bca; background-color: #428bca;
border-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; border-top-color: #428bca;
} }
.panel-primary .panel-footer + .panel-collapse .panel-body { .panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca; border-bottom-color: #428bca;
} }
@ -2730,17 +2730,17 @@ a.list-group-item:focus {
border-color: #d6e9c6; border-color: #d6e9c6;
} }
.panel-success .panel-heading { .panel-success > .panel-heading {
color: #468847; color: #468847;
background-color: #dff0d8; background-color: #dff0d8;
border-color: #d6e9c6; border-color: #d6e9c6;
} }
.panel-success .panel-heading + .panel-collapse .panel-body { .panel-success > .panel-heading + .panel-collapse .panel-body {
border-top-color: #d6e9c6; border-top-color: #d6e9c6;
} }
.panel-success .panel-footer + .panel-collapse .panel-body { .panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6; border-bottom-color: #d6e9c6;
} }
@ -2748,17 +2748,17 @@ a.list-group-item:focus {
border-color: #fbeed5; border-color: #fbeed5;
} }
.panel-warning .panel-heading { .panel-warning > .panel-heading {
color: #c09853; color: #c09853;
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #fbeed5; border-color: #fbeed5;
} }
.panel-warning .panel-heading + .panel-collapse .panel-body { .panel-warning > .panel-heading + .panel-collapse .panel-body {
border-top-color: #fbeed5; border-top-color: #fbeed5;
} }
.panel-warning .panel-footer + .panel-collapse .panel-body { .panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5; border-bottom-color: #fbeed5;
} }
@ -2766,17 +2766,17 @@ a.list-group-item:focus {
border-color: #eed3d7; border-color: #eed3d7;
} }
.panel-danger .panel-heading { .panel-danger > .panel-heading {
color: #b94a48; color: #b94a48;
background-color: #f2dede; background-color: #f2dede;
border-color: #eed3d7; border-color: #eed3d7;
} }
.panel-danger .panel-heading + .panel-collapse .panel-body { .panel-danger > .panel-heading + .panel-collapse .panel-body {
border-top-color: #eed3d7; border-top-color: #eed3d7;
} }
.panel-danger .panel-footer + .panel-collapse .panel-body { .panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #eed3d7; border-bottom-color: #eed3d7;
} }
@ -2784,17 +2784,17 @@ a.list-group-item:focus {
border-color: #bce8f1; border-color: #bce8f1;
} }
.panel-info .panel-heading { .panel-info > .panel-heading {
color: #3a87ad; color: #3a87ad;
background-color: #d9edf7; background-color: #d9edf7;
border-color: #bce8f1; border-color: #bce8f1;
} }
.panel-info .panel-heading + .panel-collapse .panel-body { .panel-info > .panel-heading + .panel-collapse .panel-body {
border-top-color: #bce8f1; border-top-color: #bce8f1;
} }
.panel-info .panel-footer + .panel-collapse .panel-body { .panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1; border-bottom-color: #bce8f1;
} }
@ -3871,6 +3871,7 @@ button.close {
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
border-collapse: separate;
table-layout: fixed; table-layout: fixed;
} }

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

File diff suppressed because one or more lines are too long

1
less/button-groups.less
View File

@ -229,6 +229,7 @@
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed; table-layout: fixed;
border-collapse: separate;
.btn { .btn {
float: none; float: none;
display: table-cell; display: table-cell;