Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMartijn Cuppens <martijn.cuppens@gmail.com>2018-11-13 23:11:59 +0300
committerGitHub <noreply@github.com>2018-11-13 23:11:59 +0300
commitfab1dea92773e796a75ac4a2fadb645714ac80ce (patch)
treeff6e357aa6548b7c7b6bdc184a26d25e6ed9de6b /scss
parentfceee8d09310ae1c49a38ed66dab77dc53120ca7 (diff)
Keep input group & form label font size in sync with form control font size (#27663)
Diffstat (limited to 'scss')
-rw-r--r--scss/_forms.scss4
-rw-r--r--scss/_input-group.scss4
2 files changed, 4 insertions, 4 deletions
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);
}