diff options
| author | Mark Otto <[email protected]> | 2013-02-02 17:01:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-02 17:01:29 -0800 |
| commit | 04aae2f56cca4438c90232b889fa5a6e1d78d223 (patch) | |
| tree | 476659ce34653f92aa1e0c44ee1b2755dd1e669c /less/variables.less | |
| parent | c64aa26d062b53a40be55ea62017bd04f523b290 (diff) | |
| parent | 24f0505bde5df08e9e7dd5b96bf0abeaab10901d (diff) | |
| download | bootstrap-04aae2f56cca4438c90232b889fa5a6e1d78d223.tar.xz bootstrap-04aae2f56cca4438c90232b889fa5a6e1d78d223.zip | |
Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less index 1f8b8ae59..d72eee21f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -60,10 +60,14 @@ // ------------------------- // Based on 14px font-size and 1.5 line-height -@padding-large: 11px 19px; // 44px +@padding-large: 11px 14px; // 44px @padding-small: 2px 10px; // 26px @padding-mini: 0 6px; // 22px +@padding-large-input: 10px 14px; // 44px +// firefox hack since it doesn't accept custom line-height for inputs and automatically sets line-height as font-size + 4 px. +// input-large at 18 + 4 = 22, so I tried to compensate on padding. + @border-radius-base: 4px; @border-radius-large: 6px; @border-radius-small: 3px; @@ -115,7 +119,12 @@ @input-color-placeholder: @grayLight; -@input-height: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border +@input-height-base: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border +@input-height-large: @line-height-base + 24px; // base line-height + 22px vertical padding + 2px top/bottom border +@input-height-small: @line-height-base + 6px; // base line-height + 4px vertical padding + 2px top/bottom border + +// adjust min-height on input sizes + @form-actions-background: #f5f5f5; |