Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-05-24 11:03:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse source
This commit is contained in:
fat 2013-07-17 23:52:55 -07:00
commit 2a4a0f70ef
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View file

@ -1147,7 +1147,7 @@ th {
.table-condensed thead > tr > td, .table-condensed thead > tr > td,
.table-condensed tbody > tr > td, .table-condensed tbody > tr > td,
.table-condensed tfoot > tr > td { .table-condensed tfoot > tr > td {
padding: 4px 5px; padding: 5px;
} }
.table-bordered { .table-bordered {

4
less/tables.less
View file

@ -25,7 +25,7 @@ th {
> tr { > tr {
> th, > th,
> td { > td {
padding: 8px; padding: @table-cell-padding;
line-height: @line-height-base; line-height: @line-height-base;
vertical-align: top; vertical-align: top;
border-top: 1px solid @table-border-color; border-top: 1px solid @table-border-color;
@ -69,7 +69,7 @@ th {
> tr { > tr {
> th, > th,
> td { > td {
padding: 4px 5px; padding: @table-condensed-cell-padding;
} }
} }
} }

3
less/variables.less
View file

@ -81,6 +81,9 @@
// Tables // Tables
// ------------------------- // -------------------------
@table-cell-padding: 8px;
@table-condensed-cell-padding: 5px;
@table-bg: transparent; // overall background-color @table-bg: transparent; // overall background-color
@table-bg-accent: #f9f9f9; // for striping @table-bg-accent: #f9f9f9; // for striping
@table-bg-hover: #f5f5f5; // for hover @table-bg-hover: #f5f5f5; // for hover