aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-07-08 01:44:09 -0700
committerMark Otto <[email protected]>2014-07-08 01:44:09 -0700
commit6fda4098538693259226b1f67d57ff4905a4c173 (patch)
tree8e3819e87a26d85d0e498b113293f2f2ea28d67d /less
parentea59c3c31a2c0e808718ea2bf31951f58e17d457 (diff)
downloadbootstrap-6fda4098538693259226b1f67d57ff4905a4c173.tar.xz
bootstrap-6fda4098538693259226b1f67d57ff4905a4c173.zip
Fix input sizing and increase vertical padding on textareas
Diffstat (limited to 'less')
-rw-r--r--less/forms.less2
-rw-r--r--less/variables.less2
2 files changed, 3 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less
index aa8019cad..e0e6c98e2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -149,6 +149,8 @@ output {
// Reset height for `textarea`s
textarea& {
height: auto;
+ padding-top: @padding-base-horizontal;
+ padding-bottom: @padding-base-horizontal;
}
}
diff --git a/less/variables.less b/less/variables.less
index e17246268..35d53910e 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -193,7 +193,7 @@
@input-color-placeholder: @gray-light;
//** Default `.form-control` height
-@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
+@input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + .1);
//** Large `.form-control` height
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
//** Small `.form-control` height