Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier

aa25ce77 · Mark Otto · 0a816e00 · aa25ce77 · aa25ce77 · aa25ce77
Commit aa25ce77 authored 10 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 11 additions and 6 deletions
+11 -6
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -5119,19 +5119,23 @@ a.list-group-item-danger.active:focus {
  border-bottom-right-radius: 3px;
  border-bottom-left-radius: 3px;
 }
-.panel > .list-group {
+.panel > .list-group,
+.panel > .panel-collapse > .list-group {
  margin-bottom: 0;
 }
-.panel > .list-group .list-group-item {
+.panel > .list-group .list-group-item,
+.panel > .panel-collapse > .list-group .list-group-item {
  border-width: 1px 0;
  border-radius: 0;
 }
-.panel > .list-group:first-child .list-group-item:first-child {
+.panel > .list-group:first-child .list-group-item:first-child,
+.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
  border-top: 0;
  border-top-left-radius: 3px;
  border-top-right-radius: 3px;
 }
-.panel > .list-group:last-child .list-group-item:last-child {
+.panel > .list-group:last-child .list-group-item:last-child,
+.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
  border-bottom: 0;
  border-bottom-right-radius: 3px;
  border-bottom-left-radius: 3px;

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/panels.less
+++ b/less/panels.less
@@ -56,7 +56,8 @@
 // any kind of custom content between the two.

 .panel {
-  > .list-group {
+  > .list-group,
+  > .panel-collapse > .list-group {
    margin-bottom: 0;

    .list-group-item {