aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-18 14:29:11 -0800
committerMark Otto <[email protected]>2014-01-18 14:29:11 -0800
commit572e6a959aba6fa905c6377b900566b7ecc7c8f4 (patch)
treef34dade7a1e2a5029cedf7d2e206fe1d7fb9ccde /less
parentb32d92ef716f08cf36c646a08a3e3215acf8db5f (diff)
parent6856c9f7f6ee3a939d41e7578cb09c39958177dd (diff)
downloadbootstrap-572e6a959aba6fa905c6377b900566b7ecc7c8f4.tar.xz
bootstrap-572e6a959aba6fa905c6377b900566b7ecc7c8f4.zip
Merge pull request #12286 from watilde/fixes-panel
Fixes #12263: Remove border radius when it's not both ends in panel
Diffstat (limited to 'less')
-rw-r--r--less/panels.less46
1 files changed, 39 insertions, 7 deletions
diff --git a/less/panels.less b/less/panels.less
index a19fa3788..e004d1715 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -27,19 +27,28 @@
.panel {
> .list-group {
margin-bottom: 0;
-
.list-group-item {
border-width: 1px 0;
-
- // Remove border radius for top one
+ border-radius: 0;
&:first-child {
- .border-top-radius(0);
+ border-top: 0;
}
- // But keep it for the last one
&:last-child {
border-bottom: 0;
}
}
+ // Add border top radius for first one
+ &:first-child {
+ .list-group-item:first-child {
+ .border-top-radius((@panel-border-radius - 1));
+ }
+ }
+ // Add border bottom radius for last one
+ &:last-child {
+ .list-group-item:last-child {
+ .border-bottom-radius((@panel-border-radius - 1));
+ }
+ }
}
}
// Collapse space between when there's no additional content.
@@ -59,7 +68,27 @@
> .table,
> .table-responsive > .table {
margin-bottom: 0;
-
+ }
+ // Add border top radius for first one
+ > .table:first-child,
+ > .table-responsive:first-child > .table:first-child {
+ > thead:first-child,
+ > tbody:first-child {
+ > tr:first-child {
+ td:first-child,
+ th:first-child {
+ border-top-left-radius: (@panel-border-radius - 1);
+ }
+ td:last-child,
+ th:last-child {
+ border-top-right-radius: (@panel-border-radius - 1);
+ }
+ }
+ }
+ }
+ // Add border bottom radius for last one
+ > .table:last-child,
+ > .table-responsive:last-child > .table:last-child {
> tbody:last-child,
> tfoot:last-child {
> tr:last-child {
@@ -97,7 +126,10 @@
> td:last-child {
border-right: 0;
}
-
+ &:first-child > th,
+ &:first-child > td {
+ border-top: 0;
+ }
&:last-child > th,
&:last-child > td {
border-bottom: 0;