aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar Schnueriger <[email protected]>2013-06-17 18:56:17 +0200
committerEdgar Schnueriger <[email protected]>2013-06-17 18:56:17 +0200
commitb0d202455d9d604050768b512ff96d3b65329867 (patch)
treeacc439f455ec819a34ab411f23a77085f66d38fd
parent5f3f73c6206acfb7d893aa3a8d26642723b8837d (diff)
downloadbootstrap-b0d202455d9d604050768b512ff96d3b65329867.tar.xz
bootstrap-b0d202455d9d604050768b512ff96d3b65329867.zip
Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49
-rw-r--r--less/forms.less1
-rw-r--r--less/variables.less2
2 files changed, 2 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less
index 10a315da6..fd44308b9 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -227,6 +227,7 @@ input[type="search"],
input[type="tel"],
input[type="color"] {
&.input-large {
+ min-height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
diff --git a/less/variables.less b/less/variables.less
index 765dff6a0..ab0136d21 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -128,7 +128,7 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2);
+@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 8);
@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2);