From: Andrew Luca Date: Sun, 15 Jul 2018 04:29:19 +0000 (+0300) Subject: Fix `custom-forms` heights and position (#25602) X-Git-Tag: v4.1.3~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fd40837e816869325e527eb292ba54d7de9c083;p=thirdparty%2Fbootstrap.git Fix `custom-forms` heights and position (#25602) Now `.custom-control` will have height equal to `$font-size-base` Fix custom checkbox and radio top position (we can't subtract rem from unit) `$line-height-base - $custom-control-indicator-size` is not valid Because `$line-height-base` is a unitless variable and `$custom-control-indicator-size` is a unit (rem) variable --- diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 1311ba482c..f4e005a962 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -10,7 +10,7 @@ .custom-control { position: relative; display: block; - min-height: (1rem * $line-height-base); + min-height: ($font-size-base * $line-height-base); padding-left: $custom-control-gutter; } @@ -63,7 +63,7 @@ // Background-color and (when enabled) gradient &::before { position: absolute; - top: (($line-height-base - $custom-control-indicator-size) / 2); + top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2); left: -$custom-control-gutter; display: block; width: $custom-control-indicator-size; @@ -78,7 +78,7 @@ // Foreground (icon) &::after { position: absolute; - top: (($line-height-base - $custom-control-indicator-size) / 2); + top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2); left: -$custom-control-gutter; display: block; width: $custom-control-indicator-size;