diff options
| author | fat <[email protected]> | 2013-07-17 23:52:55 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-17 23:52:55 -0700 |
| commit | 2a4a0f70ef6dde303d92ee2bcc082d9e9aad181b (patch) | |
| tree | d1c66ec6b9ce38b34567c307baf866d30a189693 | |
| parent | b13eecaeec6f27db8d83a8808ed4178033370e05 (diff) | |
| parent | 4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b (diff) | |
| download | bootstrap-2a4a0f70ef6dde303d92ee2bcc082d9e9aad181b.tar.xz bootstrap-2a4a0f70ef6dde303d92ee2bcc082d9e9aad181b.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/tables.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 83e16a613..e625405e2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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 { diff --git a/less/tables.less b/less/tables.less index 9d39ad39f..3a546917c 100644 --- a/less/tables.less +++ b/less/tables.less @@ -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; } } } diff --git a/less/variables.less b/less/variables.less index e01d3062d..fdd5929db 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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 |