From: Mark Otto <markdotto@gmail.com>
Date: Mon, 10 Oct 2016 01:04:30 +0000 (-0700)
Subject: Match the height of select.form-control with input.form-control
X-Git-Tag: v4.0.0-alpha.5~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20874%2Fhead;p=thirdparty%2Fbootstrap.git

Match the height of select.form-control with input.form-control

Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967.
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index d27b646d06..be19a07956 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -66,7 +66,8 @@
 
 select.form-control {
   &:not([size]):not([multiple]) {
-    height: $input-height;
+    $select-border-width: ($border-width * 2);
+    height: calc(#{$input-height} - #{$select-border-width});
   }
 
   &:focus::-ms-value {