Commit 00867616 authored by Mark Otto's avatar Mark Otto

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

Conflicts:
	dist/css/bootstrap.min.css
parents c8c92747 1e1b5c73
......@@ -2712,17 +2712,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;
}
......@@ -2730,17 +2730,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;
}
......@@ -2748,17 +2748,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;
}
......@@ -2766,17 +2766,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;
}
......@@ -2784,17 +2784,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;
}
......@@ -3871,6 +3871,7 @@ button.close {
.btn-group-justified {
display: table;
width: 100%;
border-collapse: separate;
table-layout: fixed;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -229,6 +229,7 @@
display: table;
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn {
float: none;
display: table-cell;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment