diff options
| author | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
| commit | 6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340 (patch) | |
| tree | 8480da0e7c249bf59f6a13e9f108d1429e1d4741 /less/variables.less | |
| parent | 4b40ee692dc066f2ad3c4dd96af67a83475f5cbe (diff) | |
| parent | 181b27677492050adceaa52fe972115515759f07 (diff) | |
| download | bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.tar.xz bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/less/variables.less b/less/variables.less index fdd5929db..b28d33091 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,7 +48,6 @@ @font-size-base: 14px; @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-mini: ceil(@font-size-base * 0.75); // ~11px @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @@ -86,7 +85,8 @@ @table-bg: transparent; // overall background-color @table-bg-accent: #f9f9f9; // for striping -@table-bg-hover: #f5f5f5; // for hover +@table-bg-hover: #f5f5f5; +@table-bg-active: @table-bg-hover; @table-border-color: #ddd; // table and cell border @@ -176,7 +176,8 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; -@navbar-padding: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-vertical: 15px; // Navbar links @navbar-link-color: #777; |