rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #12286 from watilde/fixes-panel

Browse Source 
Fixes #12263: Remove border radius when it's not both ends in panel
This commit is contained in:
Mark Otto 2014-01-18 14:29:11 -08:00
commit 572e6a959a
4 changed files with 101 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dist/css/bootstrap.css vendored
View File

@ -4771,14 +4771,22 @@ a.list-group-item-danger.active:focus {
} }
.panel > .list-group .list-group-item { .panel > .list-group .list-group-item {
border-width: 1px 0; border-width: 1px 0;
border-radius: 0;
} }
.panel > .list-group .list-group-item:first-child { .panel > .list-group .list-group-item:first-child {
border-top-left-radius: 0; border-top: 0;
border-top-right-radius: 0;
} }
.panel > .list-group .list-group-item:last-child { .panel > .list-group .list-group-item:last-child {
border-bottom: 0; border-bottom: 0;
} }
.panel > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
.panel > .list-group:last-child .list-group-item:last-child {
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
.panel-heading + .list-group .list-group-item:first-child { .panel-heading + .list-group .list-group-item:first-child {
border-top-width: 0; border-top-width: 0;
} }
@ -4786,24 +4794,44 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table { .panel > .table-responsive > .table {
margin-bottom: 0; margin-bottom: 0;
} }
.panel > .table > tbody:last-child > tr:last-child td:first-child, .panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table > tfoot:last-child > tr:last-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
.panel > .table > tbody:last-child > tr:last-child th:first-child, .panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
.panel > .table > tfoot:last-child > tr:last-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child { .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
border-top-left-radius: 3px;
}
.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
border-top-right-radius: 3px;
}
.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
} }
.panel > .table > tbody:last-child > tr:last-child td:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
.panel > .table > tfoot:last-child > tr:last-child td:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
.panel > .table > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
.panel > .table > tfoot:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child { .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
} }
.panel > .panel-body + .table, .panel > .panel-body + .table,
@ -4846,6 +4874,20 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
border-right: 0; border-right: 0;
} }
.panel > .table-bordered > thead > tr:first-child > th,
.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
.panel > .table-bordered > tbody > tr:first-child > th,
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
.panel > .table-bordered > tfoot > tr:first-child > th,
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
.panel > .table-bordered > thead > tr:first-child > td,
.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
.panel > .table-bordered > tbody > tr:first-child > td,
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
.panel > .table-bordered > tfoot > tr:first-child > td,
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
border-top: 0;
}
.panel > .table-bordered > thead > tr:last-child > th, .panel > .table-bordered > thead > tr:last-child > th,
.panel > .table-responsive > .table-bordered > thead > tr:last-child > th, .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
.panel > .table-bordered > tbody > tr:last-child > th, .panel > .table-bordered > tbody > tr:last-child > th,

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

46
less/panels.less
View File

@ -27,19 +27,28 @@
.panel { .panel {
> .list-group { > .list-group {
margin-bottom: 0; margin-bottom: 0;
.list-group-item { .list-group-item {
border-width: 1px 0; border-width: 1px 0;
border-radius: 0;
// Remove border radius for top one
&:first-child { &:first-child {
.border-top-radius(0); border-top: 0;
} }
// But keep it for the last one
&:last-child { &:last-child {
border-bottom: 0; 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. // Collapse space between when there's no additional content.
@ -59,7 +68,27 @@
> .table, > .table,
> .table-responsive > .table { > .table-responsive > .table {
margin-bottom: 0; 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, > tbody:last-child,
> tfoot:last-child { > tfoot:last-child {
> tr:last-child { > tr:last-child {
@ -97,7 +126,10 @@
> td:last-child { > td:last-child {
border-right: 0; border-right: 0;
} }
&:first-child > th,
&:first-child > td {
border-top: 0;
}
&:last-child > th, &:last-child > th,
&:last-child > td { &:last-child > td {
border-bottom: 0; border-bottom: 0;