0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Dropdown in panel header does not inherit its colors

Fix for issue #10627
This commit is contained in:
Chris Ziogas 2013-09-16 12:38:26 +03:00
parent 16279056ae
commit ab3d0a27b3
4 changed files with 35 additions and 1 deletions

View File

@ -5491,6 +5491,10 @@ a.list-group-item:focus {
border-top-left-radius: 3px; border-top-left-radius: 3px;
} }
.panel-heading > .dropdown .dropdown-toggle {
color: inherit;
}
.panel-title { .panel-title {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -5549,6 +5553,10 @@ a.list-group-item:focus {
border-top-color: #dddddd; border-top-color: #dddddd;
} }
.panel-default > .panel-heading > .dropdown .caret {
border-color: #333333 transparent;
}
.panel-default > .panel-footer + .panel-collapse .panel-body { .panel-default > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #dddddd; border-bottom-color: #dddddd;
} }
@ -5567,6 +5575,10 @@ a.list-group-item:focus {
border-top-color: #428bca; border-top-color: #428bca;
} }
.panel-primary > .panel-heading > .dropdown .caret {
border-color: #ffffff transparent;
}
.panel-primary > .panel-footer + .panel-collapse .panel-body { .panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca; border-bottom-color: #428bca;
} }
@ -5585,6 +5597,10 @@ a.list-group-item:focus {
border-top-color: #d6e9c6; border-top-color: #d6e9c6;
} }
.panel-success > .panel-heading > .dropdown .caret {
border-color: #468847 transparent;
}
.panel-success > .panel-footer + .panel-collapse .panel-body { .panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6; border-bottom-color: #d6e9c6;
} }
@ -5603,6 +5619,10 @@ a.list-group-item:focus {
border-top-color: #fbeed5; border-top-color: #fbeed5;
} }
.panel-warning > .panel-heading > .dropdown .caret {
border-color: #c09853 transparent;
}
.panel-warning > .panel-footer + .panel-collapse .panel-body { .panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5; border-bottom-color: #fbeed5;
} }
@ -5621,6 +5641,10 @@ a.list-group-item:focus {
border-top-color: #eed3d7; border-top-color: #eed3d7;
} }
.panel-danger > .panel-heading > .dropdown .caret {
border-color: #b94a48 transparent;
}
.panel-danger > .panel-footer + .panel-collapse .panel-body { .panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #eed3d7; border-bottom-color: #eed3d7;
} }
@ -5639,6 +5663,10 @@ a.list-group-item:focus {
border-top-color: #bce8f1; border-top-color: #bce8f1;
} }
.panel-info > .panel-heading > .dropdown .caret {
border-color: #3a87ad transparent;
}
.panel-info > .panel-footer + .panel-collapse .panel-body { .panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1; border-bottom-color: #bce8f1;
} }

File diff suppressed because one or more lines are too long

View File

@ -396,6 +396,9 @@
+ .panel-collapse .panel-body { + .panel-collapse .panel-body {
border-top-color: @border; border-top-color: @border;
} }
& > .dropdown .caret {
border-color: @heading-text-color transparent;
}
} }
& > .panel-footer { & > .panel-footer {
+ .panel-collapse .panel-body { + .panel-collapse .panel-body {

View File

@ -92,6 +92,9 @@
padding: 10px 15px; padding: 10px 15px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
.border-top-radius(@panel-border-radius - 1); .border-top-radius(@panel-border-radius - 1);
& > .dropdown .dropdown-toggle {
color: inherit;
}
} }
// Within heading, strip any `h*` tag of it's default margins for spacing. // Within heading, strip any `h*` tag of it's default margins for spacing.