From 8fcdbd38f8ca6c941ee4acc34a002ccfbbd66c5d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 7 Feb 2016 22:43:10 -0800 Subject: Remove specific line-heights from large/small inputs as well --- scss/_forms.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 03f140906..473bcaea2 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -144,7 +144,6 @@ input[type="month"] { // height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; font-size: $font-size-sm; - line-height: $line-height-sm; @include border-radius($input-border-radius-sm); } @@ -152,7 +151,6 @@ input[type="month"] { // height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; font-size: $font-size-lg; - line-height: $line-height-lg; @include border-radius($input-border-radius-lg); } -- cgit v1.2.3 From ab451e5dc0c8402574bf631ff603f384034ec993 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 7 Feb 2016 22:43:24 -0800 Subject: Remove commented out height on large/small inputs --- scss/_forms.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 473bcaea2..30f714679 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -141,14 +141,12 @@ input[type="month"] { // issue documented in https://github.com/twbs/bootstrap/issues/15074. .form-control-sm { - // height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; font-size: $font-size-sm; @include border-radius($input-border-radius-sm); } .form-control-lg { - // height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; font-size: $font-size-lg; @include border-radius($input-border-radius-lg); -- cgit v1.2.3 From 38c93371c14e8caeefc08df356a11ae19d79fae8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 7 Feb 2016 22:46:50 -0800 Subject: updated button/form-control padding and line-height - Moves from no set line-height (inherited of 1.5) to declared 1.25 for all inputs and buttons (regardless of size modifier). - Updates padding to be `.5rem` instead of `.375rem` so that padding is more likely to be whole numbers based on the root font-size. - Whole numbers will be beneficial in avoiding odd fractional pixels that can lead to misalignment as shown in #18607. - Large buttons and inputs are now a tad wider, and smaller buttons/inputs a tad shorter and narrower, too. --- scss/_forms.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 30f714679..aaa7ffc73 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -11,6 +11,7 @@ // height: $input-height; padding: $input-padding-y $input-padding-x; font-size: $font-size-base; + line-height: $input-line-height; color: $input-color; background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. -- cgit v1.2.3