mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Fixes #12822: Scope panel collapse styles to immediate panel bodies only

Browse Source
This commit is contained in:
Mark Otto
2014-02-22 22:46:03 -08:00
parent a083f0deb7
commit 66a229bdbf
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.css
Vendored
+12 -12
View File
@@ -4985,10 +4985,10 @@ a.list-group-item-danger.active:focus {
background-color: #f5f5f5; background-color: #f5f5f5;
border-color: #ddd; border-color: #ddd;
} }
.panel-default > .panel-heading + .panel-collapse .panel-body { .panel-default > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #ddd; border-top-color: #ddd;
} }
.panel-default > .panel-footer + .panel-collapse .panel-body { .panel-default > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #ddd; border-bottom-color: #ddd;
} }
.panel-primary { .panel-primary {
@@ -4999,10 +4999,10 @@ a.list-group-item-danger.active:focus {
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;
} }
.panel-success { .panel-success {
@@ -5013,10 +5013,10 @@ a.list-group-item-danger.active:focus {
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;
} }
.panel-info { .panel-info {
@@ -5027,10 +5027,10 @@ a.list-group-item-danger.active:focus {
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;
} }
.panel-warning { .panel-warning {
@@ -5041,10 +5041,10 @@ a.list-group-item-danger.active:focus {
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #faebcc; border-color: #faebcc;
} }
.panel-warning > .panel-heading + .panel-collapse .panel-body { .panel-warning > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #faebcc; border-top-color: #faebcc;
} }
.panel-warning > .panel-footer + .panel-collapse .panel-body { .panel-warning > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #faebcc; border-bottom-color: #faebcc;
} }
.panel-danger { .panel-danger {
@@ -5055,10 +5055,10 @@ a.list-group-item-danger.active:focus {
background-color: #f2dede; background-color: #f2dede;
border-color: #ebccd1; border-color: #ebccd1;
} }
.panel-danger > .panel-heading + .panel-collapse .panel-body { .panel-danger > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #ebccd1; border-top-color: #ebccd1;
} }
.panel-danger > .panel-footer + .panel-collapse .panel-body { .panel-danger > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #ebccd1; border-bottom-color: #ebccd1;
} }
.well { .well {
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/mixins.less
+2 -2
View File
@@ -424,12 +424,12 @@
background-color: @heading-bg-color; background-color: @heading-bg-color;
border-color: @heading-border; border-color: @heading-border;
+ .panel-collapse .panel-body { + .panel-collapse > .panel-body {
border-top-color: @border; border-top-color: @border;
} }
} }
& > .panel-footer { & > .panel-footer {
+ .panel-collapse .panel-body { + .panel-collapse > .panel-body {
border-bottom-color: @border; border-bottom-color: @border;
} }
} }