Skip to content

Commit 8ca5e2c

Browse files
committed
main - f8ba137 refactor: merge m3 mdc and mat tokens (#30755)
1 parent e0c6487 commit 8ca5e2c

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-
{"example":"<span class=\"hljs-keyword\">@use</span> <span class=\"hljs-string\">&#x27;@angular/material&#x27;</span> as mat;\n\n<span class=\"hljs-comment\">// Customize the entire app. Change :root to your selector if you want to scope the styles.</span>\n<span class=\"hljs-selector-pseudo\">:root</span> {\n <span class=\"hljs-keyword\">@include</span> mat.list-overrides((\n <span class=\"hljs-attribute\">active-indicator-color</span>: orange,\n <span class=\"hljs-attribute\">list-item-container-color</span>: red,\n ));\n}","themes":[{"name":"list","overridesMixin":"list-overrides","tokens":[{"name":"active-indicator-color","prefix":"mat-list","type":"color","overridesName":"active-indicator-color","derivedFrom":"--mat-sys-secondary-container"},{"name":"active-indicator-shape","prefix":"mat-list","type":"base","overridesName":"active-indicator-shape"},{"name":"list-item-container-shape","prefix":"mat-list","type":"base","overridesName":"list-item-container-shape"},{"name":"list-item-leading-avatar-shape","prefix":"mat-list","type":"base","overridesName":"list-item-leading-avatar-shape"},{"name":"list-item-container-color","prefix":"mat-list","type":"color","overridesName":"list-item-container-color"},{"name":"list-item-selected-container-color","prefix":"mat-list","type":"color","overridesName":"list-item-selected-container-color"},{"name":"list-item-leading-avatar-color","prefix":"mat-list","type":"color","overridesName":"list-item-leading-avatar-color","derivedFrom":"--mat-sys-primary-container"},{"name":"list-item-leading-icon-size","prefix":"mat-list","type":"base","overridesName":"list-item-leading-icon-size"},{"name":"list-item-leading-avatar-size","prefix":"mat-list","type":"base","overridesName":"list-item-leading-avatar-size"},{"name":"list-item-trailing-icon-size","prefix":"mat-list","type":"base","overridesName":"list-item-trailing-icon-size"},{"name":"list-item-disabled-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-state-layer-opacity"},{"name":"list-item-disabled-label-text-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-label-text-opacity"},{"name":"list-item-disabled-leading-icon-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-leading-icon-opacity"},{"name":"list-item-disabled-trailing-icon-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-trailing-icon-opacity"},{"name":"list-item-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-supporting-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-supporting-text-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-leading-icon-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-trailing-supporting-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-trailing-supporting-text-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-trailing-icon-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-selected-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-selected-trailing-icon-color","derivedFrom":"--mat-sys-primary"},{"name":"list-item-disabled-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-leading-icon-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-trailing-icon-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-leading-icon-color"},{"name":"list-item-hover-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-hover-state-layer-opacity"},{"name":"list-item-hover-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-trailing-icon-color"},{"name":"list-item-focus-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-focus-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-focus-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-focus-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-focus-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-focus-state-layer-opacity"},{"name":"list-item-label-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-font","derivedFrom":"--mat-sys-body-large-font"},{"name":"list-item-label-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-line-height","derivedFrom":"--mat-sys-body-large-line-height"},{"name":"list-item-label-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-size","derivedFrom":"--mat-sys-body-large-size"},{"name":"list-item-label-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-tracking","derivedFrom":"--mat-sys-body-large-tracking"},{"name":"list-item-label-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-weight","derivedFrom":"--mat-sys-body-large-weight"},{"name":"list-item-supporting-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-font","derivedFrom":"--mat-sys-body-medium-font"},{"name":"list-item-supporting-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-line-height","derivedFrom":"--mat-sys-body-medium-line-height"},{"name":"list-item-supporting-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-size","derivedFrom":"--mat-sys-body-medium-size"},{"name":"list-item-supporting-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-tracking","derivedFrom":"--mat-sys-body-medium-tracking"},{"name":"list-item-supporting-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-weight","derivedFrom":"--mat-sys-body-medium-weight"},{"name":"list-item-trailing-supporting-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-font","derivedFrom":"--mat-sys-label-small-font"},{"name":"list-item-trailing-supporting-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-line-height","derivedFrom":"--mat-sys-label-small-line-height"},{"name":"list-item-trailing-supporting-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-size","derivedFrom":"--mat-sys-label-small-size"},{"name":"list-item-trailing-supporting-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-tracking","derivedFrom":"--mat-sys-label-small-tracking"},{"name":"list-item-trailing-supporting-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-weight","derivedFrom":"--mat-sys-label-small-weight"},{"name":"list-item-leading-icon-start-space","prefix":"mat-list","type":"density","overridesName":"list-item-leading-icon-start-space"},{"name":"list-item-leading-icon-end-space","prefix":"mat-list","type":"density","overridesName":"list-item-leading-icon-end-space"},{"name":"list-item-one-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-one-line-container-height"},{"name":"list-item-two-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-two-line-container-height"},{"name":"list-item-three-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-three-line-container-height"}]}]}
1+
{"example":"<span class=\"hljs-keyword\">@use</span> <span class=\"hljs-string\">&#x27;@angular/material&#x27;</span> as mat;\n\n<span class=\"hljs-comment\">// Customize the entire app. Change :root to your selector if you want to scope the styles.</span>\n<span class=\"hljs-selector-pseudo\">:root</span> {\n <span class=\"hljs-keyword\">@include</span> mat.list-overrides((\n <span class=\"hljs-attribute\">active-indicator-color</span>: orange,\n <span class=\"hljs-attribute\">list-item-selected-container-color</span>: red,\n ));\n}","themes":[{"name":"list","overridesMixin":"list-overrides","tokens":[{"name":"active-indicator-color","prefix":"mat-list","type":"color","overridesName":"active-indicator-color","derivedFrom":"--mat-sys-secondary-container"},{"name":"active-indicator-shape","prefix":"mat-list","type":"base","overridesName":"active-indicator-shape"},{"name":"list-item-container-shape","prefix":"mat-list","type":"base","overridesName":"list-item-container-shape"},{"name":"list-item-leading-avatar-shape","prefix":"mat-list","type":"base","overridesName":"list-item-leading-avatar-shape"},{"name":"list-item-container-color","prefix":"mat-list","type":"base","overridesName":"list-item-container-color"},{"name":"list-item-selected-container-color","prefix":"mat-list","type":"color","overridesName":"list-item-selected-container-color"},{"name":"list-item-leading-avatar-color","prefix":"mat-list","type":"color","overridesName":"list-item-leading-avatar-color","derivedFrom":"--mat-sys-primary-container"},{"name":"list-item-leading-icon-size","prefix":"mat-list","type":"base","overridesName":"list-item-leading-icon-size"},{"name":"list-item-leading-avatar-size","prefix":"mat-list","type":"base","overridesName":"list-item-leading-avatar-size"},{"name":"list-item-trailing-icon-size","prefix":"mat-list","type":"base","overridesName":"list-item-trailing-icon-size"},{"name":"list-item-disabled-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-state-layer-opacity"},{"name":"list-item-disabled-label-text-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-label-text-opacity"},{"name":"list-item-disabled-leading-icon-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-leading-icon-opacity"},{"name":"list-item-disabled-trailing-icon-opacity","prefix":"mat-list","type":"base","overridesName":"list-item-disabled-trailing-icon-opacity"},{"name":"list-item-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-supporting-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-supporting-text-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-leading-icon-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-trailing-supporting-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-trailing-supporting-text-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-trailing-icon-color","derivedFrom":"--mat-sys-on-surface-variant"},{"name":"list-item-selected-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-selected-trailing-icon-color","derivedFrom":"--mat-sys-primary"},{"name":"list-item-disabled-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-leading-icon-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-disabled-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-disabled-trailing-icon-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-leading-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-leading-icon-color"},{"name":"list-item-hover-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-hover-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-hover-state-layer-opacity"},{"name":"list-item-hover-trailing-icon-color","prefix":"mat-list","type":"color","overridesName":"list-item-hover-trailing-icon-color"},{"name":"list-item-focus-label-text-color","prefix":"mat-list","type":"color","overridesName":"list-item-focus-label-text-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-focus-state-layer-color","prefix":"mat-list","type":"color","overridesName":"list-item-focus-state-layer-color","derivedFrom":"--mat-sys-on-surface"},{"name":"list-item-focus-state-layer-opacity","prefix":"mat-list","type":"color","overridesName":"list-item-focus-state-layer-opacity"},{"name":"list-item-label-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-font","derivedFrom":"--mat-sys-body-large-font"},{"name":"list-item-label-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-line-height","derivedFrom":"--mat-sys-body-large-line-height"},{"name":"list-item-label-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-size","derivedFrom":"--mat-sys-body-large-size"},{"name":"list-item-label-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-tracking","derivedFrom":"--mat-sys-body-large-tracking"},{"name":"list-item-label-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-label-text-weight","derivedFrom":"--mat-sys-body-large-weight"},{"name":"list-item-supporting-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-font","derivedFrom":"--mat-sys-body-medium-font"},{"name":"list-item-supporting-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-line-height","derivedFrom":"--mat-sys-body-medium-line-height"},{"name":"list-item-supporting-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-size","derivedFrom":"--mat-sys-body-medium-size"},{"name":"list-item-supporting-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-tracking","derivedFrom":"--mat-sys-body-medium-tracking"},{"name":"list-item-supporting-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-supporting-text-weight","derivedFrom":"--mat-sys-body-medium-weight"},{"name":"list-item-trailing-supporting-text-font","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-font","derivedFrom":"--mat-sys-label-small-font"},{"name":"list-item-trailing-supporting-text-line-height","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-line-height","derivedFrom":"--mat-sys-label-small-line-height"},{"name":"list-item-trailing-supporting-text-size","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-size","derivedFrom":"--mat-sys-label-small-size"},{"name":"list-item-trailing-supporting-text-tracking","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-tracking","derivedFrom":"--mat-sys-label-small-tracking"},{"name":"list-item-trailing-supporting-text-weight","prefix":"mat-list","type":"typography","overridesName":"list-item-trailing-supporting-text-weight","derivedFrom":"--mat-sys-label-small-weight"},{"name":"list-item-leading-icon-start-space","prefix":"mat-list","type":"density","overridesName":"list-item-leading-icon-start-space"},{"name":"list-item-leading-icon-end-space","prefix":"mat-list","type":"density","overridesName":"list-item-leading-icon-end-space"},{"name":"list-item-one-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-one-line-container-height"},{"name":"list-item-two-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-two-line-container-height"},{"name":"list-item-three-line-container-height","prefix":"mat-list","type":"density","overridesName":"list-item-three-line-container-height"}]}]}

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": "20.0.0-next.4+sha-2d86ad4",
3+
"version": "20.0.0-next.4+sha-f8ba137",
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": "20.0.0-next.4+sha-2d86ad4",
263-
"@angular/cdk-experimental": "20.0.0-next.4+sha-2d86ad4",
262+
"@angular/cdk": "20.0.0-next.4+sha-f8ba137",
263+
"@angular/cdk-experimental": "20.0.0-next.4+sha-f8ba137",
264264
"@angular/core": "^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0",
265265
"@angular/common": "^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0",
266-
"@angular/material": "20.0.0-next.4+sha-2d86ad4",
267-
"@angular/material-experimental": "20.0.0-next.4+sha-2d86ad4",
268-
"@angular/material-moment-adapter": "20.0.0-next.4+sha-2d86ad4",
269-
"@angular/material-luxon-adapter": "20.0.0-next.4+sha-2d86ad4",
270-
"@angular/material-date-fns-adapter": "20.0.0-next.4+sha-2d86ad4"
266+
"@angular/material": "20.0.0-next.4+sha-f8ba137",
267+
"@angular/material-experimental": "20.0.0-next.4+sha-f8ba137",
268+
"@angular/material-moment-adapter": "20.0.0-next.4+sha-f8ba137",
269+
"@angular/material-luxon-adapter": "20.0.0-next.4+sha-f8ba137",
270+
"@angular/material-date-fns-adapter": "20.0.0-next.4+sha-f8ba137"
271271
},
272272
"dependencies": {
273273
"tslib": "^2.3.0"

0 commit comments

Comments
 (0)