Merge pull request #8193 from mediafreakch/3.0.0-wip

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

Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
eee719f6 · Mark Otto · 1b89a63a · 6a79f538 · eee719f6 · eee719f6
Commit eee719f6 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 2 deletions
+3 -2
--- 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;

--- a/less/variables.less
+++ b/less/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