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

Merge pull request #11970 from supergibbs/Better_10492_fix

Browse Source 
Fixes #10492 better
This commit is contained in:
Mark Otto
2013-12-23 18:53:30 -08:00
parent 0bd5bca695 f3ce6a9696
commit 340e2f5534
4 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+20 -12
View File
@@ -4771,6 +4771,26 @@ a.list-group-item-info.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-responsive > .table > tbody:last-child > tr:last-child td:first-child,
.panel > .table > tfoot:last-child > tr:last-child td:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child,
.panel > .table > tbody:last-child > tr:last-child th:first-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child,
.panel > .table > tfoot:last-child > tr:last-child th:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child {
border-bottom-left-radius: 3px;
}
.panel > .table > tbody:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child,
.panel > .table > tfoot:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child,
.panel > .table > tbody:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child,
.panel > .table > tfoot:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child {
border-bottom-right-radius: 3px;
}
.panel > .panel-body + .table, .panel > .panel-body + .table,
.panel > .panel-body + .table-responsive { .panel > .panel-body + .table-responsive {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
@@ -4829,18 +4849,6 @@ a.list-group-item-info.active:focus {
margin-bottom: 0; margin-bottom: 0;
border: 0; border: 0;
} }
.panel > .table-striped > tbody > tr:last-child td:first-child,
.panel > .table-responsive > .table-striped > tbody > tr:last-child td:first-child,
.panel > .table-striped > tbody > tr:last-child th:first-child,
.panel > .table-responsive > .table-striped > tbody > tr:last-child th:first-child {
border-bottom-left-radius: 3px;
}
.panel > .table-striped > tbody > tr:last-child td:last-child,
.panel > .table-responsive > .table-striped > tbody > tr:last-child td:last-child,
.panel > .table-striped > tbody > tr:last-child th:last-child,
.panel > .table-responsive > .table-striped > tbody > tr:last-child th:last-child {
border-bottom-right-radius: 3px;
}
.panel-heading { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
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 -13
View File
@@ -59,6 +59,20 @@
> .table, > .table,
> .table-responsive > .table { > .table-responsive > .table {
margin-bottom: 0; margin-bottom: 0;
> tbody:last-child,
> tfoot:last-child {
> tr:last-child {
td:first-child,
th:first-child {
border-bottom-left-radius: (@panel-border-radius - 1);
}
td:last-child,
th:last-child {
border-bottom-right-radius: (@panel-border-radius - 1);
}
}
}
} }
> .panel-body + .table, > .panel-body + .table,
> .panel-body + .table-responsive { > .panel-body + .table-responsive {
@@ -95,19 +109,6 @@
border: 0; border: 0;
margin-bottom: 0; margin-bottom: 0;
} }
> .table-striped,
> .table-responsive > .table-striped {
> tbody > tr:last-child {
td:first-child,
th:first-child {
border-bottom-left-radius: (@panel-border-radius - 1);
}
td:last-child,
th:last-child {
border-bottom-right-radius: (@panel-border-radius - 1);
}
}
}
} }