(less) Merge pull request twbs#8193 from mediafreakch/3.0.0-wip

Fixes broken layout for .input-group-addons within .input-large. Follows...
stempler · Jun 20, 2013 · 10a0b1a · 10a0b1a
2 parents 4f658f2 + 16a446c
commit 10a0b1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/forms.less b/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/variables.less b/variables.less
@@ -129,8 +129,8 @@
 @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-small:             (@line-height-computed + (@padding-small-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
 
 
 // Dropdowns