mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Merge branch 'master' into pr/10656
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
+6
-3
@@ -56,13 +56,16 @@
|
||||
// watch it go full width.
|
||||
|
||||
.panel {
|
||||
> .table {
|
||||
> .table,
|
||||
> .table-responsive {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
> .panel-body + .table {
|
||||
> .panel-body + .table,
|
||||
> .panel-body + .table-responsive {
|
||||
border-top: 1px solid @table-border-color;
|
||||
}
|
||||
> .table-bordered {
|
||||
> .table-bordered,
|
||||
> .table-responsive > .table-bordered {
|
||||
border: 0;
|
||||
> thead,
|
||||
> tbody,
|
||||
|
||||
Reference in New Issue
Block a user