mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
fixes #8900: nuke empty space between panel heading and list group
This commit is contained in:
parent
a88888aaeb
commit
0561cfec6b
8
dist/css/bootstrap.css
vendored
8
dist/css/bootstrap.css
vendored
@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.panel-heading + .list-group {
|
||||
margin-top: -15px;
|
||||
}
|
||||
|
||||
.panel-heading + .list-group .list-group-item:first-child {
|
||||
border-top-width: 0;
|
||||
}
|
||||
|
||||
.panel-heading {
|
||||
padding: 10px 15px;
|
||||
margin: -15px -15px 15px;
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -11,8 +11,14 @@
|
||||
border: 1px solid @panel-border;
|
||||
border-radius: @panel-border-radius;
|
||||
.box-shadow(0 1px 1px rgba(0,0,0,.05));
|
||||
}
|
||||
|
||||
// List groups in panels
|
||||
// List groups in panels
|
||||
//
|
||||
// By default, space out list group content from panel headings to account for
|
||||
// any kind of custom content between the two.
|
||||
|
||||
.panel {
|
||||
.list-group {
|
||||
margin: 15px -15px -15px;
|
||||
|
||||
@ -30,6 +36,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
// Collapse space between when there's no additional content.
|
||||
.panel-heading + .list-group {
|
||||
margin-top: -15px;
|
||||
.list-group-item:first-child {
|
||||
border-top-width: 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Optional heading
|
||||
.panel-heading {
|
||||
|
Loading…
Reference in New Issue
Block a user