From 69158efccd61f38feaedc091643bb2b552930fcb Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Mon, 17 Jun 2013 18:56:17 +0200 Subject: [PATCH 1/2] (less) Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49 --- forms.less | 1 + variables.less | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/forms.less b/forms.less index 10a315da6a57..fd44308b9fad 100644 --- 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 index 765dff6a0ca5..ab0136d21132 100644 --- a/variables.less +++ b/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); From 16a446c61a1670039209d2efac74c70fcb132792 Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Tue, 18 Jun 2013 21:43:34 +0200 Subject: [PATCH 2/2] (less) Use correct font-size to calculate input-heights --- variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variables.less b/variables.less index ab0136d21132..21f283711550 100644 --- a/variables.less +++ b/variables.less @@ -128,8 +128,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) + 8); -@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