From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Tue, 13 Nov 2018 20:11:59 +0000 (+0100)
Subject: Keep input group & form label font size in sync with form control font size (#27663)
X-Git-Tag: v4.2.0~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fab1dea92773e796a75ac4a2fadb645714ac80ce;p=thirdparty%2Fbootstrap.git

Keep input group & form label font size in sync with form control font size (#27663)
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index b1df40be20..a83e04d657 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -95,14 +95,14 @@ select.form-control {
 .col-form-label-lg {
   padding-top: calc(#{$input-padding-y-lg} + #{$input-border-width});
   padding-bottom: calc(#{$input-padding-y-lg} + #{$input-border-width});
-  font-size: $font-size-lg;
+  font-size: $input-font-size-lg;
   line-height: $input-line-height-lg;
 }
 
 .col-form-label-sm {
   padding-top: calc(#{$input-padding-y-sm} + #{$input-border-width});
   padding-bottom: calc(#{$input-padding-y-sm} + #{$input-border-width});
-  font-size: $font-size-sm;
+  font-size: $input-font-size-sm;
   line-height: $input-line-height-sm;
 }
 
diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 707207b023..7e756fa016 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -134,7 +134,7 @@
 .input-group-lg > .input-group-append > .btn {
   height: $input-height-lg;
   padding: $input-padding-y-lg $input-padding-x-lg;
-  font-size: $font-size-lg;
+  font-size: $input-font-size-lg;
   line-height: $input-line-height-lg;
   @include border-radius($input-border-radius-lg);
 }
@@ -146,7 +146,7 @@
 .input-group-sm > .input-group-append > .btn {
   height: $input-height-sm;
   padding: $input-padding-y-sm $input-padding-x-sm;
-  font-size: $font-size-sm;
+  font-size: $input-font-size-sm;
   line-height: $input-line-height-sm;
   @include border-radius($input-border-radius-sm);
 }