Skip to content

refactor(tokens): update Sass conditional if expressions to use modern CSS syntax #6035

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(tokens): update Sass conditional if expressions to use modern CSS syntax #6035

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
17 changes: 8 additions & 9 deletions tokens/_md-comp-assist-chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ $supported-tokens: (
'pressed-state-layer-color',
'pressed-state-layer-opacity',
'trailing-space',
'with-leading-icon-leading-space',
// go/keep-sorted end
'with-leading-icon-leading-space' // go/keep-sorted end
);

$unsupported-tokens: (
Expand All @@ -79,8 +78,7 @@ $unsupported-tokens: (
'focus-state-layer-color',
'focus-state-layer-opacity',
'label-text-tracking',
'label-text-type',
// go/keep-sorted end
'label-text-type' // go/keep-sorted end
);

$_default: (
Expand All @@ -100,11 +98,12 @@ $_default: (
$new-tokens: map.merge(
shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
(
'leading-space': if($exclude-hardcoded-values, null, 16px),
'trailing-space': if($exclude-hardcoded-values, null, 16px),
'icon-label-space': if($exclude-hardcoded-values, null, 8px),
'with-leading-icon-leading-space':
if($exclude-hardcoded-values, null, 8px),
'leading-space': if(not sass($exclude-hardcoded-values): 16px),
'trailing-space': if(not sass($exclude-hardcoded-values): 16px),
'icon-label-space': if(not sass($exclude-hardcoded-values): 8px),
'with-leading-icon-leading-space': if(
not sass($exclude-hardcoded-values): 8px
),
)
);

Expand Down
30 changes: 16 additions & 14 deletions tokens/_md-comp-elevated-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,15 @@ $supported-tokens: (
'with-leading-icon-leading-space',
'with-leading-icon-trailing-space',
'with-trailing-icon-leading-space',
'with-trailing-icon-trailing-space',
// go/keep-sorted end
'with-trailing-icon-trailing-space' // go/keep-sorted end
);

$unsupported-tokens: (
// go/keep-sorted start
'focus-state-layer-color',
'focus-state-layer-opacity',
'label-text-tracking',
'label-text-type',
// go/keep-sorted end
'label-text-type' // go/keep-sorted end
);

$_default: (
Expand All @@ -93,16 +91,20 @@ $_default: (
(
// b/198759625 - Remove once spacing tokens are formally added
// go/keep-sorted start
'leading-space': if($exclude-hardcoded-values, null, 24px),
'trailing-space': if($exclude-hardcoded-values, null, 24px),
'with-leading-icon-leading-space':
if($exclude-hardcoded-values, null, 16px),
'with-leading-icon-trailing-space':
if($exclude-hardcoded-values, null, 24px),
'with-trailing-icon-leading-space':
if($exclude-hardcoded-values, null, 24px),
'with-trailing-icon-trailing-space':
if($exclude-hardcoded-values, null, 16px),
'leading-space': if(not sass($exclude-hardcoded-values): 24px),
'trailing-space': if(not sass($exclude-hardcoded-values): 24px),
'with-leading-icon-leading-space': if(
not sass($exclude-hardcoded-values): 16px
),
'with-leading-icon-trailing-space': if(
not sass($exclude-hardcoded-values): 24px
),
'with-trailing-icon-leading-space': if(
not sass($exclude-hardcoded-values): 24px
),
'with-trailing-icon-trailing-space': if(
not sass($exclude-hardcoded-values): 16px
),
// go/keep-sorted end
)
);
Expand Down
30 changes: 16 additions & 14 deletions tokens/_md-comp-filled-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,15 @@ $supported-tokens: (
'with-leading-icon-leading-space',
'with-leading-icon-trailing-space',
'with-trailing-icon-leading-space',
'with-trailing-icon-trailing-space',
// go/keep-sorted end
'with-trailing-icon-trailing-space' // go/keep-sorted end
);

$unsupported-tokens: (
// go/keep-sorted start
'focus-state-layer-color',
'focus-state-layer-opacity',
'label-text-tracking',
'label-text-type',
// go/keep-sorted end
'label-text-type' // go/keep-sorted end
);

$_default: (
Expand All @@ -93,16 +91,20 @@ $_default: (
(
// b/198759625 - Remove once spacing tokens are formally added
// go/keep-sorted start
'leading-space': if($exclude-hardcoded-values, null, 24px),
'trailing-space': if($exclude-hardcoded-values, null, 24px),
'with-leading-icon-leading-space':
if($exclude-hardcoded-values, null, 16px),
'with-leading-icon-trailing-space':
if($exclude-hardcoded-values, null, 24px),
'with-trailing-icon-leading-space':
if($exclude-hardcoded-values, null, 24px),
'with-trailing-icon-trailing-space':
if($exclude-hardcoded-values, null, 16px),
'leading-space': if(not sass($exclude-hardcoded-values): 24px),
'trailing-space': if(not sass($exclude-hardcoded-values): 24px),
'with-leading-icon-leading-space': if(
not sass($exclude-hardcoded-values): 16px
),
'with-leading-icon-trailing-space': if(
not sass($exclude-hardcoded-values): 24px
),
'with-trailing-icon-leading-space': if(
not sass($exclude-hardcoded-values): 24px
),
'with-trailing-icon-trailing-space': if(
not sass($exclude-hardcoded-values): 16px
),
// go/keep-sorted end
)
);
Expand Down
Loading