From: Edgar Schnueriger <edgar.schnueriger@ricardo.ch>
Date: Mon, 17 Jun 2013 16:56:17 +0000 (+0200)
Subject: Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64... 
X-Git-Tag: v3.0.0-rc1~256^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0d202455d9d604050768b512ff96d3b65329867;p=thirdparty%2Fbootstrap.git

Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49
---

diff --git a/less/forms.less b/less/forms.less
index 10a315da6a..fd44308b9f 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 765dff6a0c..ab0136d211 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);