Skip to content

Commit

Permalink
fix(material/badge): change legacy container size default (#29713)
Browse files Browse the repository at this point in the history
(cherry picked from commit fead293)
  • Loading branch information
andrewseguin committed Sep 10, 2024
1 parent 57028df commit 651b448
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions src/material/badge/badge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ $large-size: $default-size + 6;
height: token-utils.get-token-variable($legacy-size-var-name, $fallback: unset);
min-width: token-utils.get-token-variable($size-var-name, $fallback: unset);
min-height: token-utils.get-token-variable($size-var-name, $fallback: unset);
line-height: token-utils.get-token-variable(
$legacy-size-var-name, $fallback: token-utils.get-token-variable($size-var-name));
line-height: token-utils.get-token-variable($legacy-size-var-name);
@include token-utils.create-token-slot(padding, '#{$prefix}container-padding');
@include token-utils.create-token-slot(font-size, '#{$prefix}text-size');
@include token-utils.create-token-slot(margin, '#{$prefix}container-offset');
Expand Down
6 changes: 3 additions & 3 deletions src/material/core/tokens/m3/mat/_badge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ $prefix: (mat, badge);
small-size-text-size: token-definition.hardcode(0, $exclude-hardcoded),
container-shape: map.get($systems, md-sys-shape, corner-full),
container-size: token-definition.hardcode(16px, $exclude-hardcoded),
legacy-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
legacy-small-size-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
legacy-container-size: token-definition.hardcode(16px, $exclude-hardcoded),
legacy-small-size-container-size: token-definition.hardcode(16px, $exclude-hardcoded),
small-size-container-size: token-definition.hardcode(6px, $exclude-hardcoded),
container-padding: token-definition.hardcode(0 4px, $exclude-hardcoded),
small-size-container-padding: token-definition.hardcode(0, $exclude-hardcoded),
Expand All @@ -41,7 +41,7 @@ $prefix: (mat, badge);
large-size-container-overlap-offset: token-definition.hardcode(-12px, $exclude-hardcoded),
large-size-text-size: map.get($systems, md-sys-typescale, label-small-size),
large-size-container-padding: token-definition.hardcode(0 4px, $exclude-hardcoded),
legacy-large-size-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
legacy-large-size-container-size: token-definition.hardcode(16px, $exclude-hardcoded),
), (
primary: (
background-color: map.get($systems, md-sys-color, primary),
Expand Down

0 comments on commit 651b448

Please sign in to comment.