2
0
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:
Mark Otto
2013-10-20 22:55:45 -07:00
103 changed files with 4520 additions and 2802 deletions
+6 -3
View File
@@ -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,