Skip to content

fix: sass calculations #1401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amagana8 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

fix: sass calculations #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/scss/components/loader/loader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
}

$i: 0;
$increment: 180deg / 100;
$increment: calc(180deg / 100);

@for $i from 0 through 100 {
&.md-spinner-progress__percentage-#{$i} {
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/loader/placeholders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
}

$i: 0;
$increment: 180deg / 100;
$increment: calc(180deg / 100);

@for $i from 0 through 100 {
&.md-spinner-progress__percentage-#{$i} {
Expand Down
6 changes: 3 additions & 3 deletions core/scss/settings/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/scss/tools/functions/core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down