aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorwojtask9 <[email protected]>2017-10-02 19:15:32 +0200
committerMark Otto <[email protected]>2017-10-02 10:15:32 -0700
commit9145cc8279abb6d9ca73e18d82d6816e386cdab3 (patch)
treea1113a0591d52941ee1eba7cc0aaf28138b95eb5 /scss
parent243015186530020ca27e93a5f52076e34825ebe8 (diff)
downloadbootstrap-9145cc8279abb6d9ca73e18d82d6816e386cdab3.tar.xz
bootstrap-9145cc8279abb6d9ca73e18d82d6816e386cdab3.zip
fix .col-form-label paddings and add line-height (#23121)
Diffstat (limited to 'scss')
-rw-r--r--scss/_forms.scss15
1 files changed, 9 insertions, 6 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index fb3dc5599..69429fdef 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -88,21 +88,24 @@ select.form-control {
// For use with horizontal and inline forms, when you need the label text to
// align with the form controls.
.col-form-label {
- padding-top: calc(#{$input-btn-padding-y} - #{$input-btn-border-width} * 2);
- padding-bottom: calc(#{$input-btn-padding-y} - #{$input-btn-border-width} * 2);
+ padding-top: calc(#{$input-btn-padding-y} + #{$input-btn-border-width});
+ padding-bottom: calc(#{$input-btn-padding-y} + #{$input-btn-border-width});
margin-bottom: 0; // Override the `<label>` default
+ line-height: $input-btn-line-height;
}
.col-form-label-lg {
- padding-top: calc(#{$input-btn-padding-y-lg} - #{$input-btn-border-width} * 2);
- padding-bottom: calc(#{$input-btn-padding-y-lg} - #{$input-btn-border-width} * 2);
+ padding-top: calc(#{$input-btn-padding-y-lg} + #{$input-btn-border-width});
+ padding-bottom: calc(#{$input-btn-padding-y-lg} + #{$input-btn-border-width});
font-size: $font-size-lg;
+ line-height: $input-btn-line-height-lg;
}
.col-form-label-sm {
- padding-top: calc(#{$input-btn-padding-y-sm} - #{$input-btn-border-width} * 2);
- padding-bottom: calc(#{$input-btn-padding-y-sm} - #{$input-btn-border-width} * 2);
+ padding-top: calc(#{$input-btn-padding-y-sm} + #{$input-btn-border-width});
+ padding-bottom: calc(#{$input-btn-padding-y-sm} + #{$input-btn-border-width});
font-size: $font-size-sm;
+ line-height: $input-btn-line-height-sm;
}