Skip to content

Commit 6f70486

Browse files
andrewseguinandrewseguin
committed
rename to just token-definition
1 parent ab3ff63 commit 6f70486

File tree

137 files changed

+620
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+620
-620
lines changed

‎src/material/core/tokens/_token-definition-utils.scss renamed to ‎src/material/core/tokens/_token-definition.scss

File renamed without changes.

‎src/material/core/tokens/m2/mat/_app.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/inspection';
44
@use '../../../style/sass-utils';
55
@use '../../../style/elevation';
@@ -45,8 +45,8 @@ $prefix: (mat, app);
4545
@function get-token-slots() {
4646
@return sass-utils.deep-merge-all(
4747
get-unthemable-tokens(),
48-
get-color-tokens(token-definition-utils.$placeholder-color-config),
49-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
50-
get-density-tokens(token-definition-utils.$placeholder-density-config)
48+
get-color-tokens(token-definition.$placeholder-color-config),
49+
get-typography-tokens(token-definition.$placeholder-typography-config),
50+
get-density-tokens(token-definition.$placeholder-density-config)
5151
);
5252
}

‎src/material/core/tokens/m2/mat/_autocomplete.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/elevation';
44
@use '../../../style/sass-utils';
@@ -37,8 +37,8 @@ $prefix: (mat, autocomplete);
3737
@function get-token-slots() {
3838
@return sass-utils.deep-merge-all(
3939
get-unthemable-tokens(),
40-
get-color-tokens(token-definition-utils.$placeholder-color-config),
41-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
42-
get-density-tokens(token-definition-utils.$placeholder-density-config)
40+
get-color-tokens(token-definition.$placeholder-color-config),
41+
get-typography-tokens(token-definition.$placeholder-typography-config),
42+
get-density-tokens(token-definition.$placeholder-density-config)
4343
);
4444
}

‎src/material/core/tokens/m2/mat/_badge.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@use 'sass:map';
33
@use 'sass:math';
44
@use 'sass:color';
5-
@use '../../token-definition-utils';
5+
@use '../../token-definition';
66
@use '../../../theming/inspection';
77
@use '../../../style/sass-utils';
88

@@ -94,8 +94,8 @@ $prefix: (mat, badge);
9494
@function get-token-slots() {
9595
@return sass-utils.deep-merge-all(
9696
get-unthemable-tokens(),
97-
get-color-tokens(token-definition-utils.$placeholder-color-config),
98-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
99-
get-density-tokens(token-definition-utils.$placeholder-density-config)
97+
get-color-tokens(token-definition.$placeholder-color-config),
98+
get-typography-tokens(token-definition.$placeholder-typography-config),
99+
get-density-tokens(token-definition.$placeholder-density-config)
100100
);
101101
}

‎src/material/core/tokens/m2/mat/_bottom-sheet.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/sass-utils';
44

@@ -43,8 +43,8 @@ $prefix: (mat, bottom-sheet);
4343
@function get-token-slots() {
4444
@return sass-utils.deep-merge-all(
4545
get-unthemable-tokens(),
46-
get-color-tokens(token-definition-utils.$placeholder-color-config),
47-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
48-
get-density-tokens(token-definition-utils.$placeholder-density-config)
46+
get-color-tokens(token-definition.$placeholder-color-config),
47+
get-typography-tokens(token-definition.$placeholder-typography-config),
48+
get-density-tokens(token-definition.$placeholder-density-config)
4949
);
5050
}

‎src/material/core/tokens/m2/mat/_card.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/sass-utils';
44

@@ -55,8 +55,8 @@ $prefix: (mat, card);
5555
@function get-token-slots() {
5656
@return sass-utils.deep-merge-all(
5757
get-unthemable-tokens(),
58-
get-color-tokens(token-definition-utils.$placeholder-color-config),
59-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
60-
get-density-tokens(token-definition-utils.$placeholder-density-config)
58+
get-color-tokens(token-definition.$placeholder-color-config),
59+
get-typography-tokens(token-definition.$placeholder-typography-config),
60+
get-density-tokens(token-definition.$placeholder-density-config)
6161
);
6262
}

‎src/material/core/tokens/m2/mat/_checkbox.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/theming';
33
@use '../../../theming/inspection';
44
@use '../../../style/sass-utils';
@@ -43,8 +43,8 @@ $prefix: (mat, checkbox);
4343
@function get-token-slots() {
4444
@return sass-utils.deep-merge-all(
4545
get-unthemable-tokens(),
46-
get-color-tokens(token-definition-utils.$placeholder-color-config),
47-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
48-
get-density-tokens(token-definition-utils.$placeholder-density-config)
46+
get-color-tokens(token-definition.$placeholder-color-config),
47+
get-typography-tokens(token-definition.$placeholder-typography-config),
48+
get-density-tokens(token-definition.$placeholder-density-config)
4949
);
5050
}

‎src/material/core/tokens/m2/mat/_chip.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/inspection';
44
@use '../../../style/sass-utils';
55
@use '../../../m2/palette' as m2-palette;
@@ -56,8 +56,8 @@ $prefix: (mat, chip);
5656
@function get-token-slots() {
5757
@return sass-utils.deep-merge-all(
5858
get-unthemable-tokens(),
59-
get-color-tokens(token-definition-utils.$placeholder-color-config),
60-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
61-
get-density-tokens(token-definition-utils.$placeholder-density-config)
59+
get-color-tokens(token-definition.$placeholder-color-config),
60+
get-typography-tokens(token-definition.$placeholder-typography-config),
61+
get-density-tokens(token-definition.$placeholder-density-config)
6262
);
6363
}

‎src/material/core/tokens/m2/mat/_datepicker.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'sass:color';
22
@use 'sass:meta';
33
@use 'sass:math';
4-
@use '../../token-definition-utils';
4+
@use '../../token-definition';
55
@use '../../../theming/inspection';
66
@use '../../../style/elevation';
77
@use '../../../style/sass-utils';
@@ -175,8 +175,8 @@ $private-default-overlap-color: #a8dab5;
175175
@function get-token-slots() {
176176
@return sass-utils.deep-merge-all(
177177
get-unthemable-tokens(),
178-
get-color-tokens(token-definition-utils.$placeholder-color-config),
179-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
180-
get-density-tokens(token-definition-utils.$placeholder-density-config)
178+
get-color-tokens(token-definition.$placeholder-color-config),
179+
get-typography-tokens(token-definition.$placeholder-typography-config),
180+
get-density-tokens(token-definition.$placeholder-density-config)
181181
);
182182
}

‎src/material/core/tokens/m2/mat/_dialog.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../style/elevation';
33
@use '../../../style/sass-utils';
44

@@ -44,8 +44,8 @@ $prefix: (mat, dialog);
4444
@function get-token-slots() {
4545
@return sass-utils.deep-merge-all(
4646
get-unthemable-tokens(),
47-
get-color-tokens(token-definition-utils.$placeholder-color-config),
48-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
49-
get-density-tokens(token-definition-utils.$placeholder-density-config)
47+
get-color-tokens(token-definition.$placeholder-color-config),
48+
get-typography-tokens(token-definition.$placeholder-typography-config),
49+
get-density-tokens(token-definition.$placeholder-density-config)
5050
);
5151
}

‎src/material/core/tokens/m2/mat/_divider.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/sass-utils';
44

@@ -35,8 +35,8 @@ $prefix: (mat, divider);
3535
@function get-token-slots() {
3636
@return sass-utils.deep-merge-all(
3737
get-unthemable-tokens(),
38-
get-color-tokens(token-definition-utils.$placeholder-color-config),
39-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
40-
get-density-tokens(token-definition-utils.$placeholder-density-config)
38+
get-color-tokens(token-definition.$placeholder-color-config),
39+
get-typography-tokens(token-definition.$placeholder-typography-config),
40+
get-density-tokens(token-definition.$placeholder-density-config)
4141
);
4242
}

‎src/material/core/tokens/m2/mat/_expansion.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/theming';
44
@use '../../../theming/inspection';
55
@use '../../../style/sass-utils';
@@ -81,8 +81,8 @@ $prefix: (mat, expansion);
8181
@function get-token-slots() {
8282
@return sass-utils.deep-merge-all(
8383
get-unthemable-tokens(),
84-
get-color-tokens(token-definition-utils.$placeholder-color-config),
85-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
86-
get-density-tokens(token-definition-utils.$placeholder-density-config)
84+
get-color-tokens(token-definition.$placeholder-color-config),
85+
get-typography-tokens(token-definition.$placeholder-typography-config),
86+
get-density-tokens(token-definition.$placeholder-density-config)
8787
);
8888
}

‎src/material/core/tokens/m2/mat/_fab-small.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:meta';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/theming';
44
@use '../../../theming/inspection';
55
@use '../../../style/sass-utils';
@@ -59,11 +59,11 @@ $prefix: (mat, fab-small);
5959
$ripple-color: null;
6060
$contrast-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
6161

62-
@if (token-definition-utils.$private-is-internal-build or
62+
@if (token-definition.$private-is-internal-build or
6363
meta.type-of($contrast-color) != 'color') {
6464
$is-dark: inspection.get-theme-type($theme) == dark;
6565
$container-color: inspection.get-theme-color($theme, $palette-name);
66-
$contrast-tone: token-definition-utils.contrast-tone($container-color, $is-dark);
66+
$contrast-tone: token-definition.contrast-tone($container-color, $is-dark);
6767
$color: if($contrast-tone == 'dark', #000, #fff);
6868
$foreground-color: $color;
6969
$state-layer-color: $color;
@@ -101,8 +101,8 @@ $prefix: (mat, fab-small);
101101
@function get-token-slots() {
102102
@return sass-utils.deep-merge-all(
103103
get-unthemable-tokens(),
104-
get-color-tokens(token-definition-utils.$placeholder-color-config),
105-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
106-
get-density-tokens(token-definition-utils.$placeholder-density-config)
104+
get-color-tokens(token-definition.$placeholder-color-config),
105+
get-typography-tokens(token-definition.$placeholder-typography-config),
106+
get-density-tokens(token-definition.$placeholder-density-config)
107107
);
108108
}

‎src/material/core/tokens/m2/mat/_fab.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:meta';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/theming';
44
@use '../../../theming/inspection';
55
@use '../../../style/sass-utils';
@@ -59,11 +59,11 @@ $prefix: (mat, fab);
5959
$ripple-color: null;
6060
$contrast-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
6161

62-
@if (token-definition-utils.$private-is-internal-build or
62+
@if (token-definition.$private-is-internal-build or
6363
meta.type-of($contrast-color) != 'color') {
6464
$is-dark: inspection.get-theme-type($theme) == dark;
6565
$container-color: inspection.get-theme-color($theme, $palette-name);
66-
$contrast-tone: token-definition-utils.contrast-tone($container-color, $is-dark);
66+
$contrast-tone: token-definition.contrast-tone($container-color, $is-dark);
6767
$color: if($contrast-tone == 'dark', #000, #fff);
6868
$foreground-color: $color;
6969
$state-layer-color: $color;
@@ -101,8 +101,8 @@ $prefix: (mat, fab);
101101
@function get-token-slots() {
102102
@return sass-utils.deep-merge-all(
103103
get-unthemable-tokens(),
104-
get-color-tokens(token-definition-utils.$placeholder-color-config),
105-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
106-
get-density-tokens(token-definition-utils.$placeholder-density-config)
104+
get-color-tokens(token-definition.$placeholder-color-config),
105+
get-typography-tokens(token-definition.$placeholder-typography-config),
106+
get-density-tokens(token-definition.$placeholder-density-config)
107107
);
108108
}

‎src/material/core/tokens/m2/mat/_filled-button.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:meta';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/theming';
44
@use '../../../theming/inspection';
55
@use '../../../style/sass-utils';
@@ -56,11 +56,11 @@ $prefix: (mat, filled-button);
5656

5757
// Ideally we would derive all values directly from the theme, but it causes a lot of regressions
5858
// internally. For now we fall back to the old hardcoded behavior only for internal apps.
59-
@if (token-definition-utils.$private-is-internal-build or
59+
@if (token-definition.$private-is-internal-build or
6060
meta.type-of($contrast-color) != 'color') {
6161
$is-dark: inspection.get-theme-type($theme) == dark;
6262
$container-color: inspection.get-theme-color($theme, $palette-name);
63-
$contrast-tone: token-definition-utils.contrast-tone($container-color, $is-dark);
63+
$contrast-tone: token-definition.contrast-tone($container-color, $is-dark);
6464
$color: if($contrast-tone == 'dark', #000, #fff);
6565
$state-layer-color: $color;
6666
$ripple-color: rgba($color, 0.1);
@@ -95,8 +95,8 @@ $prefix: (mat, filled-button);
9595
@function get-token-slots() {
9696
@return sass-utils.deep-merge-all(
9797
get-unthemable-tokens(),
98-
get-color-tokens(token-definition-utils.$placeholder-color-config),
99-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
100-
get-density-tokens(token-definition-utils.$placeholder-density-config)
98+
get-color-tokens(token-definition.$placeholder-color-config),
99+
get-typography-tokens(token-definition.$placeholder-typography-config),
100+
get-density-tokens(token-definition.$placeholder-density-config)
101101
);
102102
}

‎src/material/core/tokens/m2/mat/_form-field.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use 'sass:math';
22
@use 'sass:map';
3-
@use '../../token-definition-utils';
3+
@use '../../token-definition';
44
@use '../../../style/sass-utils';
55
@use '../../../theming/theming';
66
@use '../../../theming/inspection';
@@ -158,8 +158,8 @@ $prefix: (mat, form-field);
158158
@function get-token-slots() {
159159
@return sass-utils.deep-merge-all(
160160
get-unthemable-tokens(),
161-
get-color-tokens(token-definition-utils.$placeholder-color-config),
162-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
163-
get-density-tokens(token-definition-utils.$placeholder-density-config)
161+
get-color-tokens(token-definition.$placeholder-color-config),
162+
get-typography-tokens(token-definition.$placeholder-typography-config),
163+
get-density-tokens(token-definition.$placeholder-density-config)
164164
);
165165
}

‎src/material/core/tokens/m2/mat/_full-pseudo-checkbox.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/sass-utils';
44

@@ -42,8 +42,8 @@ $prefix: (mat, full-pseudo-checkbox);
4242
@function get-token-slots() {
4343
@return sass-utils.deep-merge-all(
4444
get-unthemable-tokens(),
45-
get-color-tokens(token-definition-utils.$placeholder-color-config),
46-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
47-
get-density-tokens(token-definition-utils.$placeholder-density-config)
45+
get-color-tokens(token-definition.$placeholder-color-config),
46+
get-typography-tokens(token-definition.$placeholder-typography-config),
47+
get-density-tokens(token-definition.$placeholder-density-config)
4848
);
4949
}

‎src/material/core/tokens/m2/mat/_grid-list.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../theming/inspection';
33
@use '../../../style/sass-utils';
44

@@ -39,8 +39,8 @@ $prefix: (mat, grid-list);
3939
@function get-token-slots() {
4040
@return sass-utils.deep-merge-all(
4141
get-unthemable-tokens(),
42-
get-color-tokens(token-definition-utils.$placeholder-color-config),
43-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
44-
get-density-tokens(token-definition-utils.$placeholder-density-config)
42+
get-color-tokens(token-definition.$placeholder-color-config),
43+
get-typography-tokens(token-definition.$placeholder-typography-config),
44+
get-density-tokens(token-definition.$placeholder-density-config)
4545
);
4646
}

‎src/material/core/tokens/m2/mat/_icon-button.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:meta';
2-
@use '../../token-definition-utils';
2+
@use '../../token-definition';
33
@use '../../../theming/theming';
44
@use '../../../theming/inspection';
55
@use '../../../style/sass-utils';
@@ -71,8 +71,8 @@ $prefix: (mat, icon-button);
7171
@function get-token-slots() {
7272
@return sass-utils.deep-merge-all(
7373
get-unthemable-tokens(),
74-
get-color-tokens(token-definition-utils.$placeholder-color-config),
75-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
76-
get-density-tokens(token-definition-utils.$placeholder-density-config)
74+
get-color-tokens(token-definition.$placeholder-color-config),
75+
get-typography-tokens(token-definition.$placeholder-typography-config),
76+
get-density-tokens(token-definition.$placeholder-density-config)
7777
);
7878
}

‎src/material/core/tokens/m2/mat/_icon.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../token-definition-utils';
1+
@use '../../token-definition';
22
@use '../../../style/sass-utils';
33

44
// The prefix used to generate the fully qualified name for tokens in this file.
@@ -38,8 +38,8 @@ $prefix: (mat, icon);
3838
@function get-token-slots() {
3939
@return sass-utils.deep-merge-all(
4040
get-unthemable-tokens(),
41-
get-color-tokens(token-definition-utils.$placeholder-color-config),
42-
get-typography-tokens(token-definition-utils.$placeholder-typography-config),
43-
get-density-tokens(token-definition-utils.$placeholder-density-config)
41+
get-color-tokens(token-definition.$placeholder-color-config),
42+
get-typography-tokens(token-definition.$placeholder-typography-config),
43+
get-density-tokens(token-definition.$placeholder-density-config)
4444
);
4545
}

0 commit comments

Comments
 (0)