From cd164f859181b54824a6a3d85c78ac32a055b5e4 Mon Sep 17 00:00:00 2001 From: amagana8 Date: Thu, 1 Dec 2022 16:46:48 -0600 Subject: [PATCH] fix(sass calculations) --- core/scss/components/loader/loader.scss | 2 +- core/scss/components/loader/placeholders.scss | 2 +- core/scss/settings/settings.scss | 6 +++--- core/scss/tools/functions/core.scss | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/scss/components/loader/loader.scss b/core/scss/components/loader/loader.scss index 8ff0a72adc..404485804a 100644 --- a/core/scss/components/loader/loader.scss +++ b/core/scss/components/loader/loader.scss @@ -185,7 +185,7 @@ } $i: 0; - $increment: 180deg / 100; + $increment: calc(180deg / 100); @for $i from 0 through 100 { &.md-spinner-progress__percentage-#{$i} { diff --git a/core/scss/components/loader/placeholders.scss b/core/scss/components/loader/placeholders.scss index fda93b60eb..c8a968af93 100644 --- a/core/scss/components/loader/placeholders.scss +++ b/core/scss/components/loader/placeholders.scss @@ -175,7 +175,7 @@ } $i: 0; - $increment: 180deg / 100; + $increment: calc(180deg / 100); @for $i from 0 through 100 { &.md-spinner-progress__percentage-#{$i} { diff --git a/core/scss/settings/settings.scss b/core/scss/settings/settings.scss index 281e613318..5ca7d72f8a 100644 --- a/core/scss/settings/settings.scss +++ b/core/scss/settings/settings.scss @@ -4220,7 +4220,7 @@ $contrast-class: '#{$prefix}--contrast' !default; $base-cap-height: 0.0618em; // 8px used in _trumps.spacing.responsive.scss -$base-unit-rem: $rem-base / 1px; +$base-unit-rem: calc($rem-base / 1px); $base-unit-px: 4; $base-rem: 0.5rem; @@ -4256,10 +4256,10 @@ $definition-list-margin-bottom: 0.5rem; // ex.: golden ratio // current: 16 * 1.71429 / 4 = 6.85716 -$base-scale: $base-unit-rem * $base-line-height-ratio / $base-unit-px; +$base-scale: calc($base-unit-rem * $base-line-height-ratio / $base-unit-px); // 4px = 0.25rem -$base-unit: $base-line-height / $base-scale * $rem-base; +$base-unit: calc($base-line-height / $base-scale * $rem-base); // We use these to control text direction settings $text-direction: ltr; diff --git a/core/scss/tools/functions/core.scss b/core/scss/tools/functions/core.scss index cca6c51990..67fbe39b3b 100644 --- a/core/scss/tools/functions/core.scss +++ b/core/scss/tools/functions/core.scss @@ -103,7 +103,7 @@ $modules: () !default; } @function strip-unit($num) { - @return $num / ($num * 0 + 1); + @return calc($num / ($num * 0 + 1)); } @function text-inputs($types: all, $selector: input) { @@ -132,7 +132,7 @@ $modules: () !default; } @function convert-to-rem($value, $base-value: $rem-base) { - $value: strip-unit($value) / strip-unit($base-value) * 1rem; + $value: calc(strip-unit($value) / strip-unit($base-value) * 1rem); @if ($value == 0rem) { $value: 0;