mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-18 10:52:19 +01:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
commit
2a4a0f70ef
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -1147,7 +1147,7 @@ th {
|
||||
.table-condensed thead > tr > td,
|
||||
.table-condensed tbody > tr > td,
|
||||
.table-condensed tfoot > tr > td {
|
||||
padding: 4px 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.table-bordered {
|
||||
|
@ -25,7 +25,7 @@ th {
|
||||
> tr {
|
||||
> th,
|
||||
> td {
|
||||
padding: 8px;
|
||||
padding: @table-cell-padding;
|
||||
line-height: @line-height-base;
|
||||
vertical-align: top;
|
||||
border-top: 1px solid @table-border-color;
|
||||
@ -69,7 +69,7 @@ th {
|
||||
> tr {
|
||||
> th,
|
||||
> td {
|
||||
padding: 4px 5px;
|
||||
padding: @table-condensed-cell-padding;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -81,6 +81,9 @@
|
||||
// Tables
|
||||
// -------------------------
|
||||
|
||||
@table-cell-padding: 8px;
|
||||
@table-condensed-cell-padding: 5px;
|
||||
|
||||
@table-bg: transparent; // overall background-color
|
||||
@table-bg-accent: #f9f9f9; // for striping
|
||||
@table-bg-hover: #f5f5f5; // for hover
|
||||
|
Loading…
x
Reference in New Issue
Block a user