diff options
| author | Florian Schlittenbauer <[email protected]> | 2016-11-28 22:33:11 +0100 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-11-28 13:33:11 -0800 |
| commit | 959c4e527c6ef69623928db638267ba1c370479d (patch) | |
| tree | d07494658350cbdab69a9ac9cc4d279c243e39fd | |
| parent | bccbc4f0c3952fde00b3335b240965a5fec936c4 (diff) | |
| download | bootstrap-959c4e527c6ef69623928db638267ba1c370479d.tar.xz bootstrap-959c4e527c6ef69623928db638267ba1c370479d.zip | |
Fix incorrect select height calculation (#21171)
| -rw-r--r-- | scss/_forms.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 08086c22c..5ea3963e4 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -67,7 +67,7 @@ select.form-control { &:not([size]):not([multiple]) { $select-border-width: ($border-width * 2); - height: calc(#{$input-height} - #{$select-border-width}); + height: calc(#{$input-height} + #{$select-border-width}); } &:focus::-ms-value { diff --git a/scss/_variables.scss b/scss/_variables.scss index cc77d6271..d57e59575 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -416,7 +416,7 @@ $input-padding-y-sm: .25rem !default; $input-padding-x-lg: 1.5rem !default; $input-padding-y-lg: .75rem !default; -$input-height: (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default; +$input-height: (($font-size-base * $input-line-height) + ($input-padding-y * 2)) !default; $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; |