Skip to content

Commit 18528ba

Browse files
committed
main - 371446a feat(material/theming): Disambiguate token names in theme overrides (#29859)
1 parent 35ecece commit 18528ba

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"core","overridesMixin":"core-overrides","tokens":[{"name":"background-color","type":"color","sources":[{"prefix":"mat-app","derivedFrom":"background"}]},{"name":"color","type":"color","sources":[{"prefix":"mat-ripple","derivedFrom":"on-surface"}]},{"name":"disabled-selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"surface"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"elevation-shadow-level-0","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-1","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-10","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-11","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-12","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-13","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-14","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-15","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-16","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-17","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-18","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-19","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-2","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-20","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-21","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-22","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-23","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-24","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-3","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-4","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-5","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-6","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-7","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-8","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"elevation-shadow-level-9","type":"color","sources":[{"prefix":"mat-app"}]},{"name":"focus-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"hover-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-primary"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"selected-state-label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-secondary-container"}]},{"name":"selected-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"secondary-container"}]},{"name":"text-color","type":"color","sources":[{"prefix":"mat-app","derivedFrom":"on-background"}]},{"name":"unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface-variant"}]},{"name":"label-text-font","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-font"}]},{"name":"label-text-line-height","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-line-height"}]},{"name":"label-text-size","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-size"}]},{"name":"label-text-tracking","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-tracking"}]},{"name":"label-text-weight","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-weight"}]}]},{"name":"optgroup","overridesMixin":"optgroup-overrides","tokens":[{"name":"label-text-color","type":"color","sources":[{"prefix":"mat-optgroup","derivedFrom":"on-surface-variant"}]},{"name":"label-text-font","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-font"}]},{"name":"label-text-line-height","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-line-height"}]},{"name":"label-text-size","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-size"}]},{"name":"label-text-tracking","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-tracking"}]},{"name":"label-text-weight","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-weight"}]}]},{"name":"option","overridesMixin":"option-overrides","tokens":[{"name":"focus-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"hover-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"selected-state-label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-secondary-container"}]},{"name":"selected-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"secondary-container"}]},{"name":"label-text-font","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-font"}]},{"name":"label-text-line-height","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-line-height"}]},{"name":"label-text-size","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-size"}]},{"name":"label-text-tracking","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-tracking"}]},{"name":"label-text-weight","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-weight"}]}]},{"name":"ripple","overridesMixin":"ripple-overrides","tokens":[{"name":"color","type":"color","sources":[{"prefix":"mat-ripple","derivedFrom":"on-surface"}]}]},{"name":"pseudo-checkbox","overridesMixin":"pseudo-checkbox-overrides","tokens":[{"name":"disabled-selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"surface"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-primary"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface-variant"}]}]}]
1+
[{"name":"core","overridesMixin":"core-overrides","tokens":[]},{"name":"optgroup","overridesMixin":"optgroup-overrides","tokens":[{"name":"label-text-color","type":"color","sources":[{"prefix":"mat-optgroup","derivedFrom":"on-surface-variant"}]},{"name":"label-text-font","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-font"}]},{"name":"label-text-line-height","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-line-height"}]},{"name":"label-text-size","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-size"}]},{"name":"label-text-tracking","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-tracking"}]},{"name":"label-text-weight","type":"typography","sources":[{"prefix":"mat-optgroup","derivedFrom":"title-small-weight"}]}]},{"name":"option","overridesMixin":"option-overrides","tokens":[{"name":"focus-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"hover-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-surface"}]},{"name":"selected-state-label-text-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"on-secondary-container"}]},{"name":"selected-state-layer-color","type":"color","sources":[{"prefix":"mat-option","derivedFrom":"secondary-container"}]},{"name":"label-text-font","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-font"}]},{"name":"label-text-line-height","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-line-height"}]},{"name":"label-text-size","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-size"}]},{"name":"label-text-tracking","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"label-large-tracking"}]},{"name":"label-text-weight","type":"typography","sources":[{"prefix":"mat-option","derivedFrom":"body-large-weight"}]}]},{"name":"ripple","overridesMixin":"ripple-overrides","tokens":[{"name":"color","type":"color","sources":[{"prefix":"mat-ripple","derivedFrom":"on-surface"}]}]},{"name":"pseudo-checkbox","overridesMixin":"pseudo-checkbox-overrides","tokens":[{"name":"disabled-selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"surface"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"disabled-unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface"}]},{"name":"selected-checkmark-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-primary"},{"prefix":"mat-minimal-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"selected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"primary"}]},{"name":"unselected-icon-color","type":"color","sources":[{"prefix":"mat-full-pseudo-checkbox","derivedFrom":"on-surface-variant"}]}]}]

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular/components-examples",
3-
"version": "19.0.0-next.8+sha-9c3af28",
3+
"version": "19.0.0-next.8+sha-371446a",
44
"description": "Angular Components Examples",
55
"private": true,
66
"repository": {
@@ -259,15 +259,15 @@
259259
},
260260
"homepage": "https://github.com/angular/components#readme",
261261
"peerDependencies": {
262-
"@angular/cdk": "19.0.0-next.8+sha-9c3af28",
263-
"@angular/cdk-experimental": "19.0.0-next.8+sha-9c3af28",
262+
"@angular/cdk": "19.0.0-next.8+sha-371446a",
263+
"@angular/cdk-experimental": "19.0.0-next.8+sha-371446a",
264264
"@angular/core": "^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0",
265265
"@angular/common": "^19.0.0-0 || ^19.1.0-0 || ^19.2.0-0 || ^19.3.0-0 || ^20.0.0-0",
266-
"@angular/material": "19.0.0-next.8+sha-9c3af28",
267-
"@angular/material-experimental": "19.0.0-next.8+sha-9c3af28",
268-
"@angular/material-moment-adapter": "19.0.0-next.8+sha-9c3af28",
269-
"@angular/material-luxon-adapter": "19.0.0-next.8+sha-9c3af28",
270-
"@angular/material-date-fns-adapter": "19.0.0-next.8+sha-9c3af28"
266+
"@angular/material": "19.0.0-next.8+sha-371446a",
267+
"@angular/material-experimental": "19.0.0-next.8+sha-371446a",
268+
"@angular/material-moment-adapter": "19.0.0-next.8+sha-371446a",
269+
"@angular/material-luxon-adapter": "19.0.0-next.8+sha-371446a",
270+
"@angular/material-date-fns-adapter": "19.0.0-next.8+sha-371446a"
271271
},
272272
"dependencies": {
273273
"tslib": "^2.3.0"

0 commit comments

Comments
 (0)