]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Keep input group & form label font size in sync with form control font size (#27663)
authorMartijn Cuppens <martijn.cuppens@gmail.com>
Tue, 13 Nov 2018 20:11:59 +0000 (21:11 +0100)
committerGitHub <noreply@github.com>
Tue, 13 Nov 2018 20:11:59 +0000 (21:11 +0100)
scss/_forms.scss
scss/_input-group.scss

index b1df40be20ec134e01d5f6f09ffdb5df8bdade01..a83e04d6577a458ac92bae25444464f9a134b103 100644 (file)
@@ -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;
 }
 
index 707207b0238ee92631ca05e76b3a3c16acdb10f0..7e756fa0169ade1945d78f5cbc346421b0e5767d 100644 (file)
 .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);
 }
 .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);
 }