Fix incorrect select height calculation (#21171)

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 08086c22ce5821eeb648d1d9f7fa5bd3895921d3..5ea3963e42e0ba6b522b8d2388ca31f6977cdeef 100644 (file)
--- 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 cc77d6271341966b35345cc775cdbe5593ae5b97..d57e595752938fcbabfb5489376be729726fd741 100644 (file)
--- 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;