diff --git a/src/material/autocomplete/_m2-autocomplete.scss b/src/material/autocomplete/_m2-autocomplete.scss index 95a74fc5a7e7..b633ba8912ad 100644 --- a/src/material/autocomplete/_m2-autocomplete.scss +++ b/src/material/autocomplete/_m2-autocomplete.scss @@ -1,7 +1,5 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; @use '../core/style/elevation'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -28,14 +26,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/badge/_m2-badge.scss b/src/material/badge/_m2-badge.scss index 1d6d8d2a1069..83e5300f60a6 100644 --- a/src/material/badge/_m2-badge.scss +++ b/src/material/badge/_m2-badge.scss @@ -2,9 +2,7 @@ @use 'sass:map'; @use 'sass:math'; @use 'sass:color'; -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; $_default-size: 22px; $_small-size: $_default-size - 6px; @@ -94,14 +92,3 @@ $_large-size: $_default-size + 6px; @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/bottom-sheet/_m2-bottom-sheet.scss b/src/material/bottom-sheet/_m2-bottom-sheet.scss index b16feb1e3d25..e3b676b567d7 100644 --- a/src/material/bottom-sheet/_m2-bottom-sheet.scss +++ b/src/material/bottom-sheet/_m2-bottom-sheet.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -37,14 +35,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/button-toggle/_m2-button-toggle.scss b/src/material/button-toggle/_m2-button-toggle.scss index 6235ade542d5..5ac59a3b7b18 100644 --- a/src/material/button-toggle/_m2-button-toggle.scss +++ b/src/material/button-toggle/_m2-button-toggle.scss @@ -1,6 +1,5 @@ @use 'sass:map'; @use 'sass:meta'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; @use '../core/style/sass-utils'; @@ -103,14 +102,3 @@ button-toggle-height: map.get($size-scale, $density-scale) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/button/_m2-button.scss b/src/material/button/_m2-button.scss index b05a4fa1d575..8b9d0aedbca3 100644 --- a/src/material/button/_m2-button.scss +++ b/src/material/button/_m2-button.scss @@ -3,7 +3,6 @@ @use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -238,14 +237,3 @@ button-tonal-touch-target-display: $touch-target-display, ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/button/_m2-fab.scss b/src/material/button/_m2-fab.scss index 2fc633c8053d..152890cc00be 100644 --- a/src/material/button/_m2-fab.scss +++ b/src/material/button/_m2-fab.scss @@ -2,7 +2,6 @@ @use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -117,14 +116,3 @@ fab-touch-target-display: if($density-scale < -1, none, block), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/button/_m2-icon-button.scss b/src/material/button/_m2-icon-button.scss index 231c8cb75247..16d133944146 100644 --- a/src/material/button/_m2-icon-button.scss +++ b/src/material/button/_m2-icon-button.scss @@ -1,9 +1,7 @@ @use 'sass:meta'; @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -71,14 +69,3 @@ @return $tokens; } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/card/_m2-card.scss b/src/material/card/_m2-card.scss index 65ca6bb564ec..e57aa97da312 100644 --- a/src/material/card/_m2-card.scss +++ b/src/material/card/_m2-card.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -50,14 +48,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/checkbox/_m2-checkbox.scss b/src/material/checkbox/_m2-checkbox.scss index 25b4a9532523..1059a95f7dfe 100644 --- a/src/material/checkbox/_m2-checkbox.scss +++ b/src/material/checkbox/_m2-checkbox.scss @@ -98,14 +98,3 @@ ), $scale) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/chips/_m2-chip.scss b/src/material/chips/_m2-chip.scss index 9ed8cc8a249d..a61a9d3575fd 100644 --- a/src/material/chips/_m2-chip.scss +++ b/src/material/chips/_m2-chip.scss @@ -1,9 +1,7 @@ @use 'sass:map'; @use 'sass:meta'; @use 'sass:color'; -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/m2/palette' as m2-palette; @use '../core/theming/theming'; @@ -110,14 +108,3 @@ ) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/_m2-app.scss b/src/material/core/_m2-app.scss index f5a0b9591706..ced5ab5ea094 100644 --- a/src/material/core/_m2-app.scss +++ b/src/material/core/_m2-app.scss @@ -1,7 +1,5 @@ @use 'sass:map'; -@use './tokens/m2-utils'; @use './theming/inspection'; -@use './style/sass-utils'; @use './style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -36,14 +34,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/option/_m2-optgroup.scss b/src/material/core/option/_m2-optgroup.scss index 5393ee1e37e6..1c0c2c3cbd0d 100644 --- a/src/material/core/option/_m2-optgroup.scss +++ b/src/material/core/option/_m2-optgroup.scss @@ -1,6 +1,4 @@ -@use '../style/sass-utils'; @use '../theming/inspection'; -@use '../tokens/m2-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -30,14 +28,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/option/_m2-option.scss b/src/material/core/option/_m2-option.scss index 873b2802c5b1..57480fa22e8a 100644 --- a/src/material/core/option/_m2-option.scss +++ b/src/material/core/option/_m2-option.scss @@ -1,6 +1,4 @@ -@use '../tokens/m2-utils'; @use '../theming/inspection'; -@use '../style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -38,14 +36,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/ripple/_m2-ripple.scss b/src/material/core/ripple/_m2-ripple.scss index fdc54a4e933c..97500db8f37b 100644 --- a/src/material/core/ripple/_m2-ripple.scss +++ b/src/material/core/ripple/_m2-ripple.scss @@ -1,7 +1,5 @@ @use 'sass:meta'; -@use '../tokens/m2-utils'; @use '../theming/inspection'; -@use '../style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -33,14 +31,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss b/src/material/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss index b28d6a3e5797..d8fb5707899c 100644 --- a/src/material/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss +++ b/src/material/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss @@ -1,6 +1,4 @@ -@use '../../tokens/m2-utils'; @use '../../theming/inspection'; -@use '../../style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -37,14 +35,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/core/tokens/_m2-utils.scss b/src/material/core/tokens/_m2-utils.scss index 5ef6d41d0ddd..f2c00ddf6422 100644 --- a/src/material/core/tokens/_m2-utils.scss +++ b/src/material/core/tokens/_m2-utils.scss @@ -1,53 +1,10 @@ -@use '../m2/palette'; -@use '../m2/theming'; -@use '../m2/typography'; @use 'sass:color'; @use 'sass:math'; @use 'sass:meta'; -$_placeholder-color-palette: theming.define-palette(palette.$red-palette); - // Indicates whether we're building internally. Used for backwards compatibility. $private-is-internal-build: false; -// Placeholder color config that can be passed to token getter functions when generating token -// slots. -$placeholder-color-config: ( - primary: $_placeholder-color-palette, - accent: $_placeholder-color-palette, - warn: $_placeholder-color-palette, - is-dark: false, - foreground: palette.$light-theme-foreground-palette, - background: palette.$light-theme-background-palette, -); - -$_placeholder-typography-level-config: typography.typography-config-level-from-mdc(body1); - -// Placeholder typography config that can be passed to token getter functions when generating token -// slots. -$placeholder-typography-config: ( - font-family: 'Roboto, sans-serif', - headline-1: $_placeholder-typography-level-config, - headline-2: $_placeholder-typography-level-config, - headline-3: $_placeholder-typography-level-config, - headline-4: $_placeholder-typography-level-config, - headline-5: $_placeholder-typography-level-config, - headline-6: $_placeholder-typography-level-config, - subtitle-1: $_placeholder-typography-level-config, - subtitle-2: $_placeholder-typography-level-config, - body-1: $_placeholder-typography-level-config, - body-2: $_placeholder-typography-level-config, - caption: $_placeholder-typography-level-config, - button: $_placeholder-typography-level-config, - overline: $_placeholder-typography-level-config, - subheading-1: $_placeholder-typography-level-config, - title: $_placeholder-typography-level-config, -); - -// Placeholder density config that can be passed to token getter functions when generating token -// slots. -$placeholder-density-config: 0; - /// Inherited function from MDC that computes which contrast tone to use on top of a color. /// This is used only in a narrow set of use cases when generating M2 button tokens to maintain /// backwards compatibility. diff --git a/src/material/datepicker/_m2-datepicker.scss b/src/material/datepicker/_m2-datepicker.scss index c8df26e6c9d2..3fd2274ef1c6 100644 --- a/src/material/datepicker/_m2-datepicker.scss +++ b/src/material/datepicker/_m2-datepicker.scss @@ -1,7 +1,6 @@ @use 'sass:color'; @use 'sass:meta'; @use 'sass:math'; -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; @use '../core/style/elevation'; @use '../core/style/sass-utils'; @@ -174,14 +173,3 @@ $private-default-overlap-color: #a8dab5; @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/dialog/_m2-dialog.scss b/src/material/dialog/_m2-dialog.scss index e36026b7ce20..7d31d03d3a11 100644 --- a/src/material/dialog/_m2-dialog.scss +++ b/src/material/dialog/_m2-dialog.scss @@ -63,14 +63,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/divider/_m2-divider.scss b/src/material/divider/_m2-divider.scss index aff96f191460..cddad07f9f38 100644 --- a/src/material/divider/_m2-divider.scss +++ b/src/material/divider/_m2-divider.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -26,14 +24,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/expansion/_m2-expansion.scss b/src/material/expansion/_m2-expansion.scss index df6ec7aa2b77..754abd876d6f 100644 --- a/src/material/expansion/_m2-expansion.scss +++ b/src/material/expansion/_m2-expansion.scss @@ -1,8 +1,6 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -76,14 +74,3 @@ expansion-header-expanded-state-height: map.get($expanded-scale, $scale), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/form-field/_m2-form-field.scss b/src/material/form-field/_m2-form-field.scss index 589bc1753da4..633c39db251a 100644 --- a/src/material/form-field/_m2-form-field.scss +++ b/src/material/form-field/_m2-form-field.scss @@ -254,14 +254,3 @@ if($hide-label, $vertical-padding, $filled-with-label-padding-bottom), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/grid-list/_m2-grid-list.scss b/src/material/grid-list/_m2-grid-list.scss index ae372864f96a..d7d770c03519 100644 --- a/src/material/grid-list/_m2-grid-list.scss +++ b/src/material/grid-list/_m2-grid-list.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -34,14 +32,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/icon/_m2-icon.scss b/src/material/icon/_m2-icon.scss index 8c6e575b9aef..4732a4b07a7e 100644 --- a/src/material/icon/_m2-icon.scss +++ b/src/material/icon/_m2-icon.scss @@ -1,5 +1,3 @@ -@use '../core/tokens/m2-utils'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -29,14 +27,3 @@ icon-color: $color, ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/list/_m2-list.scss b/src/material/list/_m2-list.scss index 791f426b931c..2a1ec75462d7 100644 --- a/src/material/list/_m2-list.scss +++ b/src/material/list/_m2-list.scss @@ -1,4 +1,3 @@ -@use '../core/tokens/m2-utils'; @use '../core/style/sass-utils'; @use '../core/theming/inspection'; @use 'sass:map'; @@ -121,14 +120,3 @@ ), $scale), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/menu/_m2-menu.scss b/src/material/menu/_m2-menu.scss index 757fa1b2c897..561b4405a382 100644 --- a/src/material/menu/_m2-menu.scss +++ b/src/material/menu/_m2-menu.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -55,14 +53,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/paginator/_m2-paginator.scss b/src/material/paginator/_m2-paginator.scss index fca76fbccf8f..9bc44cb45516 100644 --- a/src/material/paginator/_m2-paginator.scss +++ b/src/material/paginator/_m2-paginator.scss @@ -1,6 +1,5 @@ @use 'sass:math'; @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; @use '../core/style/sass-utils'; @@ -74,14 +73,3 @@ paginator-touch-target-display: if($density-scale < -2, none, block), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/progress-bar/_m2-progress-bar.scss b/src/material/progress-bar/_m2-progress-bar.scss index 125c89d733a8..fe9fb213013f 100644 --- a/src/material/progress-bar/_m2-progress-bar.scss +++ b/src/material/progress-bar/_m2-progress-bar.scss @@ -1,6 +1,4 @@ @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; -@use '../core/tokens/m2-utils'; @use 'sass:color'; @use 'sass:meta'; @@ -44,14 +42,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/progress-spinner/_m2-progress-spinner.scss b/src/material/progress-spinner/_m2-progress-spinner.scss index a8c9af3de647..52becf6a56f4 100644 --- a/src/material/progress-spinner/_m2-progress-spinner.scss +++ b/src/material/progress-spinner/_m2-progress-spinner.scss @@ -1,6 +1,4 @@ @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; -@use '../core/tokens/m2-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -31,14 +29,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/radio/_m2-radio.scss b/src/material/radio/_m2-radio.scss index 4dd40a99f5e6..1e222986e91a 100644 --- a/src/material/radio/_m2-radio.scss +++ b/src/material/radio/_m2-radio.scss @@ -1,8 +1,6 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/m2/palette' as m2-palette; @use '../core/m2/theming' as m2-theming; @@ -69,14 +67,3 @@ radio-touch-target-display: if($scale < -1, none, block) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/select/_m2-select.scss b/src/material/select/_m2-select.scss index 32f4cc96ace7..335880de5b48 100644 --- a/src/material/select/_m2-select.scss +++ b/src/material/select/_m2-select.scss @@ -65,14 +65,3 @@ ), $density-scale), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/sidenav/_m2-sidenav.scss b/src/material/sidenav/_m2-sidenav.scss index 19adfe773cad..764a2c58b201 100644 --- a/src/material/sidenav/_m2-sidenav.scss +++ b/src/material/sidenav/_m2-sidenav.scss @@ -1,6 +1,5 @@ @use 'sass:color'; @use 'sass:meta'; -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; @use '../core/style/elevation'; @use '../core/style/sass-utils'; @@ -50,14 +49,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/slide-toggle/_m2-slide-toggle.scss b/src/material/slide-toggle/_m2-slide-toggle.scss index 47215aea7c1a..dc614c5d179f 100644 --- a/src/material/slide-toggle/_m2-slide-toggle.scss +++ b/src/material/slide-toggle/_m2-slide-toggle.scss @@ -1,8 +1,6 @@ @use '../core/style/elevation'; -@use '../core/style/sass-utils'; @use '../core/theming/inspection'; @use '../core/theming/theming'; -@use '../core/tokens/m2-utils'; @use 'sass:map'; // Tokens that can't be configured through Angular Material's current theming API, @@ -153,14 +151,3 @@ ), $scale) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/slider/_m2-slider.scss b/src/material/slider/_m2-slider.scss index fe6f43758299..bc13d030d162 100644 --- a/src/material/slider/_m2-slider.scss +++ b/src/material/slider/_m2-slider.scss @@ -1,6 +1,4 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; -@use '../core/style/sass-utils'; @use '../core/theming/inspection'; @use '../core/style/elevation'; @@ -92,14 +90,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/snack-bar/_m2-snack-bar.scss b/src/material/snack-bar/_m2-snack-bar.scss index 60dee011a751..fd5b3e0102dc 100644 --- a/src/material/snack-bar/_m2-snack-bar.scss +++ b/src/material/snack-bar/_m2-snack-bar.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use 'sass:meta'; @use 'sass:color'; @@ -48,14 +46,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/sort/_m2-sort.scss b/src/material/sort/_m2-sort.scss index 895e8ed9d71c..f4dd2af3b8f0 100644 --- a/src/material/sort/_m2-sort.scss +++ b/src/material/sort/_m2-sort.scss @@ -1,8 +1,6 @@ @use 'sass:color'; @use 'sass:meta'; -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -44,14 +42,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/stepper/_m2-stepper.scss b/src/material/stepper/_m2-stepper.scss index 37f1a4cdeef4..462653ef5e88 100644 --- a/src/material/stepper/_m2-stepper.scss +++ b/src/material/stepper/_m2-stepper.scss @@ -1,8 +1,6 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -81,14 +79,3 @@ stepper-header-edit-state-icon-foreground-color: $active-state-foreground, ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/table/_m2-table.scss b/src/material/table/_m2-table.scss index 1d71afadd0c4..7cf24d69f90d 100644 --- a/src/material/table/_m2-table.scss +++ b/src/material/table/_m2-table.scss @@ -1,8 +1,6 @@ @use 'sass:map'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/tokens/m2-utils'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -79,14 +77,3 @@ table-row-item-container-height: map.get($cell-scale, $scale), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/tabs/_m2-tabs.scss b/src/material/tabs/_m2-tabs.scss index e0dac76e36dd..a1f2d877d0d3 100644 --- a/src/material/tabs/_m2-tabs.scss +++ b/src/material/tabs/_m2-tabs.scss @@ -1,8 +1,6 @@ @use 'sass:map'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; -@use '../core/tokens/m2-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -87,14 +85,3 @@ ), $scale), ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/timepicker/_m2-timepicker.scss b/src/material/timepicker/_m2-timepicker.scss index c0343c433452..e932f3e9bbf6 100644 --- a/src/material/timepicker/_m2-timepicker.scss +++ b/src/material/timepicker/_m2-timepicker.scss @@ -1,6 +1,4 @@ -@use '../core/tokens/m2-utils'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; @use '../core/style/elevation'; // Tokens that can't be configured through Angular Material's current theming API, @@ -28,14 +26,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/toolbar/_m2-toolbar.scss b/src/material/toolbar/_m2-toolbar.scss index c87488581cd9..c3aea1e60022 100644 --- a/src/material/toolbar/_m2-toolbar.scss +++ b/src/material/toolbar/_m2-toolbar.scss @@ -1,8 +1,6 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -61,14 +59,3 @@ toolbar-container-text-color: $text-color, ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/tooltip/_m2-tooltip.scss b/src/material/tooltip/_m2-tooltip.scss index 021d0fcf1649..b28ca9a69544 100644 --- a/src/material/tooltip/_m2-tooltip.scss +++ b/src/material/tooltip/_m2-tooltip.scss @@ -1,6 +1,4 @@ @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; -@use '../core/tokens/m2-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -39,14 +37,3 @@ @function get-density-tokens($theme) { @return (); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -} diff --git a/src/material/tree/_m2-tree.scss b/src/material/tree/_m2-tree.scss index b58215876511..c17fc54eeeed 100644 --- a/src/material/tree/_m2-tree.scss +++ b/src/material/tree/_m2-tree.scss @@ -1,8 +1,6 @@ @use 'sass:map'; -@use '../core/tokens/m2-utils'; @use '../core/theming/theming'; @use '../core/theming/inspection'; -@use '../core/style/sass-utils'; // Tokens that can't be configured through Angular Material's current theming API, // but may be in a future version of the theming API. @@ -46,14 +44,3 @@ tree-node-min-height: map.get($min-height-scale, $density-scale) ); } - -// Combines the tokens generated by the above functions into a single map with placeholder values. -// This is used to create token slots. -@function get-token-slots() { - @return sass-utils.deep-merge-all( - get-unthemable-tokens(), - get-color-tokens(m2-utils.$placeholder-color-config), - get-typography-tokens(m2-utils.$placeholder-typography-config), - get-density-tokens(m2-utils.$placeholder-density-config) - ); -}