diff options
| author | Mark Otto <[email protected]> | 2013-06-20 15:44:08 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-20 15:44:08 -0700 |
| commit | eee719f608cd0e1fe9db7cd1206b1d4dc2078bd5 (patch) | |
| tree | d551a6e2324622678cb869d3627a13131256440c | |
| parent | 1b89a63a48f0bfd6ba024f1cf573c03a42aa5ef2 (diff) | |
| parent | 6a79f53899b0d1e02d41252d0753116b3a121cd0 (diff) | |
| download | bootstrap-eee719f608cd0e1fe9db7cd1206b1d4dc2078bd5.tar.xz bootstrap-eee719f608cd0e1fe9db7cd1206b1d4dc2078bd5.zip | |
Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
| -rw-r--r-- | less/forms.less | 1 | ||||
| -rw-r--r-- | less/variables.less | 4 |
2 files changed, 3 insertions, 2 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 e71dd03e1..f91846126 100644 --- 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 |