From fd9dc1a0ca879f5624f4ef8c381136c506b0bff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miha=20Er=C5=BEen?= <miha.erzen1@gmail.com>
Date: Fri, 11 Jan 2019 13:22:14 +0100
Subject: [PATCH] Fix input-height-inner wrongly calculated (#28018)
In a scenario where `$input-line-height` or `$input-font-size` are different than `$input-btn-line-height` and `$input-btn-font-size` the final `$input-height-inner` was wrongly calculated.
---
scss/_variables.scss | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 8219065652..7dd5289e9e 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -493,13 +493,13 @@ $input-plaintext-color: $body-color !default;
$input-height-border: $input-border-width * 2 !default;
-$input-height-inner: ($input-btn-font-size * $input-btn-line-height) + ($input-btn-padding-y * 2) !default;
+$input-height-inner: ($input-font-size * $input-line-height) + ($input-padding-y * 2) !default;
$input-height: calc(#{$input-height-inner} + #{$input-height-border}) !default;
-$input-height-inner-sm: ($input-btn-font-size-sm * $input-btn-line-height-sm) + ($input-btn-padding-y-sm * 2) !default;
+$input-height-inner-sm: ($input-font-size-sm * $input-line-height-sm) + ($input-padding-y-sm * 2) !default;
$input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) !default;
-$input-height-inner-lg: ($input-btn-font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default;
+$input-height-inner-lg: ($input-font-size-lg * $input-line-height-lg) + ($input-padding-y-lg * 2) !default;
$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
$input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
--
GitLab