0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00

Handle the error directly in the function

This commit is contained in:
louismaxime.piton 2023-08-31 12:05:42 +02:00
parent fee563d1fc
commit af0eaf66d1
2 changed files with 8 additions and 8 deletions

View File

@ -260,9 +260,11 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
} }
@function divide($dividend, $divisor, $precision: 10) { @function divide($dividend, $divisor, $precision: 10) {
$dividend-unit: unit($dividend);
$divisor-unit: unit($divisor);
$sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1); $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
$dividend: abs($dividend); $dividend: if($dividend-unit == "%", abs(calc($dividend / 1%)), abs($dividend));
$divisor: abs($divisor); $divisor: if($divisor-unit == "%", abs(calc($divisor / 1%)), abs($divisor));
@if $dividend == 0 { @if $dividend == 0 {
@return 0; @return 0;
} }
@ -287,8 +289,6 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
} }
} }
$result: $result * $factor * $sign; $result: $result * $factor * $sign;
$dividend-unit: unit($dividend);
$divisor-unit: unit($divisor);
$unit-map: ( $unit-map: (
"px": 1px, "px": 1px,
"rem": 1rem, "rem": 1rem,

View File

@ -53,9 +53,11 @@ $enable-rfs: true !default;
$rfs-base-value-unit: unit($rfs-base-value); $rfs-base-value-unit: unit($rfs-base-value);
@function divide($dividend, $divisor, $precision: 10) { @function divide($dividend, $divisor, $precision: 10) {
$dividend-unit: unit($dividend);
$divisor-unit: unit($divisor);
$sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1); $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
$dividend: abs($dividend); $dividend: if($dividend-unit == "%", abs(calc($dividend / 1%)), abs($dividend));
$divisor: abs($divisor); $divisor: if($divisor-unit == "%", abs(calc($divisor / 1%)), abs($divisor));
@if $dividend == 0 { @if $dividend == 0 {
@return 0; @return 0;
} }
@ -80,8 +82,6 @@ $rfs-base-value-unit: unit($rfs-base-value);
} }
} }
$result: $result * $factor * $sign; $result: $result * $factor * $sign;
$dividend-unit: unit($dividend);
$divisor-unit: unit($divisor);
$unit-map: ( $unit-map: (
"px": 1px, "px": 1px,
"rem": 1rem, "rem": 1rem,