diff options
| author | Martijn Cuppens <[email protected]> | 2019-08-30 09:42:41 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-08-30 10:42:41 +0300 |
| commit | 007ea0d8d043a788383109e1883717875fa5530d (patch) | |
| tree | 5a02009ea53a3efcb2faba0b852b544ef8f337f4 /scss/forms | |
| parent | ae249e8f559b88f9db78ed96a39f680aea43c051 (diff) | |
| download | bootstrap-007ea0d8d043a788383109e1883717875fa5530d.tar.xz bootstrap-007ea0d8d043a788383109e1883717875fa5530d.zip | |
Clean up line heights & add line height utilities (#29271)
Diffstat (limited to 'scss/forms')
| -rw-r--r-- | scss/forms/_form-check.scss | 3 | ||||
| -rw-r--r-- | scss/forms/_form-control.scss | 2 | ||||
| -rw-r--r-- | scss/forms/_input-group.scss | 2 | ||||
| -rw-r--r-- | scss/forms/_labels.scss | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index b5dffa04e..bd35b6b04 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -13,8 +13,7 @@ float: left; width: $form-check-input-width; height: $form-check-input-width; - // Todo: Change static value to base line-height? - margin-top: calc((1.5em - #{$form-check-input-width}) / 2); // line-height minus check height + margin-top: ($line-height-base - $form-check-input-width) / 2; // line-height minus check height margin-left: $form-check-padding-left * -1; background-color: $form-check-input-bg; border: $form-check-input-border; diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss index 209b6a56e..a9f534f03 100644 --- a/scss/forms/_form-control.scss +++ b/scss/forms/_form-control.scss @@ -99,7 +99,6 @@ min-height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; @include font-size($input-font-size-sm); - line-height: $input-line-height-sm; @include border-radius($input-border-radius-sm); } @@ -107,7 +106,6 @@ min-height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; @include font-size($input-font-size-lg); - line-height: $input-line-height-lg; @include border-radius($input-border-radius-lg); } diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss index 05eae6a49..b965f394f 100644 --- a/scss/forms/_input-group.scss +++ b/scss/forms/_input-group.scss @@ -139,7 +139,6 @@ .input-group-lg > .input-group-append > .btn { padding: $input-padding-y-lg $input-padding-x-lg; @include font-size($input-font-size-lg); - line-height: $input-line-height-lg; @include border-radius($input-border-radius-lg); } @@ -159,7 +158,6 @@ .input-group-sm > .input-group-append > .btn { padding: $input-padding-y-sm $input-padding-x-sm; @include font-size($input-font-size-sm); - line-height: $input-line-height-sm; @include border-radius($input-border-radius-sm); } diff --git a/scss/forms/_labels.scss b/scss/forms/_labels.scss index 1a4ea8c5c..b4ccfa804 100644 --- a/scss/forms/_labels.scss +++ b/scss/forms/_labels.scss @@ -16,12 +16,10 @@ padding-top: calc(#{$input-padding-y-lg} + #{$input-border-width}); padding-bottom: calc(#{$input-padding-y-lg} + #{$input-border-width}); @include 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}); @include font-size($input-font-size-sm); - line-height: $input-line-height-sm; } |