mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

fixes #8900: nuke empty space between panel heading and list group

Browse Source
This commit is contained in:
Mark Otto
2013-08-11 15:01:16 -07:00
parent a88888aaeb
commit 0561cfec6b
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+8
View File
@@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text {
border-bottom: 0; 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 { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
margin: -15px -15px 15px; margin: -15px -15px 15px;
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/panels.less
+14 -1
View File
@@ -11,8 +11,14 @@
border: 1px solid @panel-border; border: 1px solid @panel-border;
border-radius: @panel-border-radius; border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05)); .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 { .list-group {
margin: 15px -15px -15px; 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 // Optional heading
.panel-heading { .panel-heading {