aboutsummaryrefslogtreecommitdiff
path: root/less/panels.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-06-08 13:57:44 -0700
committerMark Otto <[email protected]>2014-06-08 13:57:44 -0700
commitd1872b4c98f26b1bfcd7e007133b97e6602dd0d0 (patch)
treeccc12bda1d6df512fbc9c4023b296f46a6f05e3f /less/panels.less
parent5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805 (diff)
parent5cd72ce23058b47a739c7e2005ab5c3d4e28ff30 (diff)
downloadbootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.tar.xz
bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.zip
Merge branch 'master' into pr/13736
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css
Diffstat (limited to 'less/panels.less')
-rw-r--r--less/panels.less2
1 files changed, 1 insertions, 1 deletions
diff --git a/less/panels.less b/less/panels.less
index 3f8e6a73e..98dbf890d 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -208,7 +208,7 @@
.panel-heading {
border-bottom: 0;
- + .panel-collapse .panel-body {
+ + .panel-collapse > .panel-body {
border-top: 1px solid @panel-inner-border;
}
}