mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-02-02 17:01:29 -08:00
parent c64aa26d06 24f0505bde
commit 04aae2f56c
3 changed files with 148 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/variables.less
+11 -2
View File
@@ -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;