From 59c44fc2f9266b60d22e9bd5ff5d39e7d0ee8dff Mon Sep 17 00:00:00 2001 From: Elizabeth Mitchell Date: Fri, 25 Aug 2023 13:44:30 -0700 Subject: [PATCH] fix(tokens): rename token override files BREAKING CHANGE: Change "radio-button" and "progress-indicator" Sass token APIs to "radio" and "progress". This matches the tag names of their components. PiperOrigin-RevId: 560184741 --- progress/internal/_circular-progress.scss | 4 ++-- progress/internal/_linear-progress.scss | 4 ++-- radio/internal/_radio.scss | 4 ++-- tokens/_index.scss | 8 +++----- ...ess-indicator.scss => _md-comp-circular-progress.scss} | 0 ...gress-indicator.scss => _md-comp-linear-progress.scss} | 0 .../{_md-comp-radio-button.scss => _md-comp-radio.scss} | 0 7 files changed, 9 insertions(+), 11 deletions(-) rename tokens/{_md-comp-circular-progress-indicator.scss => _md-comp-circular-progress.scss} (100%) rename tokens/{_md-comp-linear-progress-indicator.scss => _md-comp-linear-progress.scss} (100%) rename tokens/{_md-comp-radio-button.scss => _md-comp-radio.scss} (100%) diff --git a/progress/internal/_circular-progress.scss b/progress/internal/_circular-progress.scss index 0349d1a01..59b66885d 100644 --- a/progress/internal/_circular-progress.scss +++ b/progress/internal/_circular-progress.scss @@ -11,7 +11,7 @@ // go/keep-sorted end @mixin theme($tokens) { - $supported-tokens: tokens.$md-comp-circular-progress-indicator-supported-tokens; + $supported-tokens: tokens.$md-comp-circular-progress-supported-tokens; @each $token, $value in $tokens { @if list.index($supported-tokens, $token) == null { @error 'Token `#{$token}` is not a supported token.'; @@ -24,7 +24,7 @@ } @mixin styles() { - $tokens: tokens.md-comp-circular-progress-indicator-values(); + $tokens: tokens.md-comp-circular-progress-values(); $container-padding: 4px; diff --git a/progress/internal/_linear-progress.scss b/progress/internal/_linear-progress.scss index b3083b2d7..ccd2ae000 100644 --- a/progress/internal/_linear-progress.scss +++ b/progress/internal/_linear-progress.scss @@ -11,7 +11,7 @@ // go/keep-sorted end @mixin theme($tokens) { - $supported-tokens: tokens.$md-comp-linear-progress-indicator-supported-tokens; + $supported-tokens: tokens.$md-comp-linear-progress-supported-tokens; @each $token, $value in $tokens { @if list.index($supported-tokens, $token) == null { @error 'Token `#{$token}` is not a supported token.'; @@ -46,7 +46,7 @@ $_dot-background: 0 / $_dot-background-width 100% ); @mixin styles() { - $tokens: tokens.md-comp-linear-progress-indicator-values(); + $tokens: tokens.md-comp-linear-progress-values(); :host { @each $token, $value in $tokens { diff --git a/radio/internal/_radio.scss b/radio/internal/_radio.scss index 1e68455aa..ab686554c 100644 --- a/radio/internal/_radio.scss +++ b/radio/internal/_radio.scss @@ -17,7 +17,7 @@ $_md-sys-motion: tokens.md-sys-motion-values(); @mixin theme($tokens) { - $supported-tokens: tokens.$md-comp-radio-button-supported-tokens; + $supported-tokens: tokens.$md-comp-radio-supported-tokens; @each $token, $value in $tokens { @if list.index($supported-tokens, $token) == null { @@ -31,7 +31,7 @@ $_md-sys-motion: tokens.md-sys-motion-values(); } @mixin styles() { - $tokens: tokens.md-comp-radio-button-values(); + $tokens: tokens.md-comp-radio-values(); :host { @each $token, $value in $tokens { diff --git a/tokens/_index.scss b/tokens/_index.scss index f5de3e623..66aead98e 100644 --- a/tokens/_index.scss +++ b/tokens/_index.scss @@ -7,8 +7,7 @@ @forward './md-comp-assist-chip' as md-comp-assist-chip-*; @forward './md-comp-badge' as md-comp-badge-*; @forward './md-comp-checkbox' as md-comp-checkbox-*; -@forward './md-comp-circular-progress-indicator' as - md-comp-circular-progress-indicator-*; +@forward './md-comp-circular-progress' as md-comp-circular-progress-*; @forward './md-comp-dialog' as md-comp-dialog-*; @forward './md-comp-divider' as md-comp-divider-*; @forward './md-comp-elevated-button' as md-comp-elevated-button-*; @@ -29,8 +28,7 @@ @forward './md-comp-icon' as md-comp-icon-*; @forward './md-comp-icon-button' as md-comp-icon-button-*; @forward './md-comp-input-chip' as md-comp-input-chip-*; -@forward './md-comp-linear-progress-indicator' as - md-comp-linear-progress-indicator-*; +@forward './md-comp-linear-progress' as md-comp-linear-progress-*; @forward './md-comp-list' as md-comp-list-*; @forward './md-comp-list-item' as md-comp-list-item-*; @forward './md-comp-menu' as md-comp-menu-*; @@ -44,7 +42,7 @@ md-comp-outlined-segmented-button-*; @forward './md-comp-outlined-select' as md-comp-outlined-select-*; @forward './md-comp-outlined-text-field' as md-comp-outlined-text-field-*; -@forward './md-comp-radio-button' as md-comp-radio-button-*; +@forward './md-comp-radio' as md-comp-radio-*; @forward './md-comp-ripple' as md-comp-ripple-*; @forward './md-comp-slider' as md-comp-slider-*; @forward './md-comp-suggestion-chip' as md-comp-suggestion-chip-*; diff --git a/tokens/_md-comp-circular-progress-indicator.scss b/tokens/_md-comp-circular-progress.scss similarity index 100% rename from tokens/_md-comp-circular-progress-indicator.scss rename to tokens/_md-comp-circular-progress.scss diff --git a/tokens/_md-comp-linear-progress-indicator.scss b/tokens/_md-comp-linear-progress.scss similarity index 100% rename from tokens/_md-comp-linear-progress-indicator.scss rename to tokens/_md-comp-linear-progress.scss diff --git a/tokens/_md-comp-radio-button.scss b/tokens/_md-comp-radio.scss similarity index 100% rename from tokens/_md-comp-radio-button.scss rename to tokens/_md-comp-radio.scss