aboutsummaryrefslogtreecommitdiff
path: root/less/variables.less
diff options
context:
space:
mode:
authorGil Barbara <[email protected]>2013-01-31 19:00:22 -0200
committerGil Barbara <[email protected]>2013-01-31 19:00:22 -0200
commite69912c163e64af91bdda623dce9cf84b7081eea (patch)
tree6fbc576b7c3832a0a232f4183d7267384f5ccbac /less/variables.less
parentd44acb7f886f6d501105c8cf9aab78aaeeab387c (diff)
downloadbootstrap-e69912c163e64af91bdda623dce9cf84b7081eea.tar.xz
bootstrap-e69912c163e64af91bdda623dce9cf84b7081eea.zip
Update line-height and padding for input sizes
Diffstat (limited to 'less/variables.less')
-rw-r--r--less/variables.less13
1 files changed, 11 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less
index 538e2bd8b..256959d64 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -53,10 +53,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;
@@ -107,7 +111,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;