From 959c4e527c6ef69623928db638267ba1c370479d Mon Sep 17 00:00:00 2001
From: Florian Schlittenbauer <schliflo@users.noreply.github.com>
Date: Mon, 28 Nov 2016 22:33:11 +0100
Subject: [PATCH] Fix incorrect select height calculation (#21171)

---
 scss/_forms.scss     | 2 +-
 scss/_variables.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 08086c22ce58..5ea3963e42e0 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 cc77d6271341..d57e59575293 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;