@angular/material 19.0.0-next.7 → 19.0.0-next.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_index.scss +3 -2
- package/autocomplete/_autocomplete-theme.scss +30 -21
- package/badge/_badge-theme.scss +31 -21
- package/bottom-sheet/_bottom-sheet-theme.scss +25 -17
- package/button/_button-theme.scss +220 -100
- package/button/_fab-theme.scss +88 -41
- package/button/_icon-button-theme.scss +31 -22
- package/button/index.d.ts +2 -2
- package/button-toggle/_button-toggle-theme.scss +52 -32
- package/card/_card-theme.scss +72 -35
- package/checkbox/_checkbox-theme.scss +6 -4
- package/chips/_chips-theme.scss +57 -27
- package/core/_core-theme.scss +62 -33
- package/core/_core.scss +1 -3
- package/core/index.d.ts +14 -0
- package/core/option/_optgroup-theme.scss +22 -15
- package/core/option/_option-theme.scss +27 -18
- package/core/ripple/_ripple-theme.scss +26 -18
- package/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss +40 -18
- package/core/theming/_all-theme.scss +3 -0
- package/core/tokens/_density.scss +1 -0
- package/core/tokens/_m3-system.scss +34 -6
- package/core/tokens/_token-utils.scss +91 -34
- package/core/tokens/m2/_index.scss +2 -0
- package/core/tokens/m2/mat/_badge.scss +12 -3
- package/core/tokens/m2/mat/_timepicker.scss +44 -0
- package/core/tokens/m2/mdc/_radio.scss +1 -1
- package/core/tokens/m3/_index.scss +2 -0
- package/core/tokens/m3/definitions/_md-comp-elevated-card.scss +1 -1
- package/core/tokens/m3/mat/_badge.scss +6 -3
- package/core/tokens/m3/mat/_timepicker.scss +22 -0
- package/core/typography/_all-typography.scss +2 -0
- package/datepicker/_datepicker-theme.scss +46 -29
- package/datepicker/index.d.ts +1 -1
- package/dialog/_dialog-theme.scss +39 -20
- package/dialog/index.d.ts +6 -3
- package/divider/_divider-theme.scss +21 -14
- package/expansion/_expansion-theme.scss +29 -21
- package/fesm2022/autocomplete.mjs +14 -16
- package/fesm2022/autocomplete.mjs.map +1 -1
- package/fesm2022/badge.mjs +11 -12
- package/fesm2022/badge.mjs.map +1 -1
- package/fesm2022/bottom-sheet.mjs +11 -11
- package/fesm2022/bottom-sheet.mjs.map +1 -1
- package/fesm2022/button-toggle.mjs +14 -13
- package/fesm2022/button-toggle.mjs.map +1 -1
- package/fesm2022/button.mjs +45 -43
- package/fesm2022/button.mjs.map +1 -1
- package/fesm2022/card.mjs +49 -60
- package/fesm2022/card.mjs.map +1 -1
- package/fesm2022/checkbox.mjs +19 -18
- package/fesm2022/checkbox.mjs.map +1 -1
- package/fesm2022/chips.mjs +52 -55
- package/fesm2022/chips.mjs.map +1 -1
- package/fesm2022/core.mjs +122 -116
- package/fesm2022/core.mjs.map +1 -1
- package/fesm2022/datepicker.mjs +98 -106
- package/fesm2022/datepicker.mjs.map +1 -1
- package/fesm2022/dialog/testing.mjs +0 -1
- package/fesm2022/dialog/testing.mjs.map +1 -1
- package/fesm2022/dialog.mjs +28 -33
- package/fesm2022/dialog.mjs.map +1 -1
- package/fesm2022/divider.mjs +8 -8
- package/fesm2022/divider.mjs.map +1 -1
- package/fesm2022/expansion.mjs +31 -34
- package/fesm2022/expansion.mjs.map +1 -1
- package/fesm2022/form-field.mjs +38 -45
- package/fesm2022/form-field.mjs.map +1 -1
- package/fesm2022/grid-list.mjs +26 -29
- package/fesm2022/grid-list.mjs.map +1 -1
- package/fesm2022/icon/testing.mjs +7 -7
- package/fesm2022/icon/testing.mjs.map +1 -1
- package/fesm2022/icon.mjs +12 -12
- package/fesm2022/icon.mjs.map +1 -1
- package/fesm2022/input.mjs +7 -8
- package/fesm2022/input.mjs.map +1 -1
- package/fesm2022/list.mjs +60 -67
- package/fesm2022/list.mjs.map +1 -1
- package/fesm2022/menu.mjs +23 -24
- package/fesm2022/menu.mjs.map +1 -1
- package/fesm2022/paginator/testing.mjs +2 -2
- package/fesm2022/paginator/testing.mjs.map +1 -1
- package/fesm2022/paginator.mjs +11 -11
- package/fesm2022/paginator.mjs.map +1 -1
- package/fesm2022/progress-bar.mjs +8 -8
- package/fesm2022/progress-bar.mjs.map +1 -1
- package/fesm2022/progress-spinner.mjs +8 -8
- package/fesm2022/progress-spinner.mjs.map +1 -1
- package/fesm2022/radio.mjs +14 -13
- package/fesm2022/radio.mjs.map +1 -1
- package/fesm2022/select.mjs +12 -13
- package/fesm2022/select.mjs.map +1 -1
- package/fesm2022/sidenav.mjs +28 -30
- package/fesm2022/sidenav.mjs.map +1 -1
- package/fesm2022/slide-toggle.mjs +19 -18
- package/fesm2022/slide-toggle.mjs.map +1 -1
- package/fesm2022/slider.mjs +21 -21
- package/fesm2022/slider.mjs.map +1 -1
- package/fesm2022/snack-bar.mjs +25 -28
- package/fesm2022/snack-bar.mjs.map +1 -1
- package/fesm2022/sort.mjs +17 -16
- package/fesm2022/sort.mjs.map +1 -1
- package/fesm2022/stepper.mjs +37 -40
- package/fesm2022/stepper.mjs.map +1 -1
- package/fesm2022/table.mjs +57 -73
- package/fesm2022/table.mjs.map +1 -1
- package/fesm2022/tabs.mjs +57 -63
- package/fesm2022/tabs.mjs.map +1 -1
- package/fesm2022/timepicker/testing.mjs +196 -0
- package/fesm2022/timepicker/testing.mjs.map +1 -0
- package/fesm2022/timepicker.mjs +842 -0
- package/fesm2022/timepicker.mjs.map +1 -0
- package/fesm2022/toolbar.mjs +11 -12
- package/fesm2022/toolbar.mjs.map +1 -1
- package/fesm2022/tooltip.mjs +11 -12
- package/fesm2022/tooltip.mjs.map +1 -1
- package/fesm2022/tree.mjs +26 -32
- package/fesm2022/tree.mjs.map +1 -1
- package/form-field/_form-field-theme.scss +105 -56
- package/form-field/index.d.ts +1 -1
- package/grid-list/_grid-list-theme.scss +18 -12
- package/icon/_icon-theme.scss +15 -11
- package/icon/index.d.ts +1 -1
- package/input/_input-theme.scss +11 -8
- package/list/_list-theme.scss +82 -44
- package/menu/_menu-theme.scss +26 -18
- package/menu/index.d.ts +0 -1
- package/package.json +10 -2
- package/paginator/_paginator-theme.scss +32 -20
- package/prebuilt-themes/azure-blue.css +1 -1
- package/prebuilt-themes/cyan-orange.css +1 -1
- package/prebuilt-themes/deeppurple-amber.css +1 -1
- package/prebuilt-themes/indigo-pink.css +1 -1
- package/prebuilt-themes/magenta-violet.css +1 -1
- package/prebuilt-themes/pink-bluegrey.css +1 -1
- package/prebuilt-themes/purple-green.css +1 -1
- package/prebuilt-themes/rose-red.css +1 -1
- package/progress-bar/_progress-bar-theme.scss +13 -11
- package/progress-spinner/_progress-spinner-theme.scss +34 -20
- package/radio/_radio-theme.scss +50 -26
- package/schematics/collection.json +3 -3
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-add/index.mjs +1 -1
- package/schematics/ng-generate/{m3-theme → theme-color}/index_bundled.js +454 -288
- package/schematics/ng-generate/theme-color/index_bundled.js.map +7 -0
- package/schematics/ng-generate/{m3-theme → theme-color}/schema.json +7 -13
- package/select/_select-theme.scss +31 -22
- package/sidenav/_sidenav-theme.scss +21 -14
- package/slide-toggle/_slide-toggle-theme.scss +42 -22
- package/slider/_slider-theme.scss +55 -35
- package/snack-bar/_snack-bar-theme.scss +22 -14
- package/sort/_sort-theme.scss +26 -18
- package/stepper/_stepper-theme.scss +33 -24
- package/table/_table-theme.scss +29 -20
- package/tabs/_tabs-theme.scss +89 -46
- package/tabs/index.d.ts +2 -2
- package/timepicker/_timepicker-theme.scss +120 -0
- package/timepicker/index.d.ts +297 -0
- package/timepicker/testing/index.d.ts +113 -0
- package/toolbar/_toolbar-theme.scss +28 -19
- package/tooltip/_tooltip-theme.scss +11 -12
- package/tree/_tree-theme.scss +26 -18
- package/schematics/ng-generate/m3-theme/index_bundled.js.map +0 -7
|
@@ -8,27 +8,29 @@
|
|
|
8
8
|
@use '../core/theming/inspection';
|
|
9
9
|
@use '../core/theming/validation';
|
|
10
10
|
|
|
11
|
-
|
|
12
11
|
@mixin base($theme) {
|
|
13
12
|
@if inspection.get-theme-version($theme) == 1 {
|
|
14
13
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
|
|
15
|
-
}
|
|
16
|
-
@else {
|
|
14
|
+
} @else {
|
|
17
15
|
// Add default values for tokens not related to color, typography, or density.
|
|
18
16
|
@include sass-utils.current-selector-or-root() {
|
|
19
|
-
@include token-utils.create-token-values(
|
|
20
|
-
tokens-mdc-icon-button
|
|
17
|
+
@include token-utils.create-token-values(
|
|
18
|
+
tokens-mdc-icon-button.$prefix,
|
|
19
|
+
tokens-mdc-icon-button.get-unthemable-tokens()
|
|
20
|
+
);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
@mixin _icon-button-variant($theme, $palette) {
|
|
26
|
-
$mdc-tokens: if(
|
|
26
|
+
$mdc-tokens: if(
|
|
27
|
+
$palette,
|
|
27
28
|
tokens-mdc-icon-button.private-get-color-palette-color-tokens($theme, $palette),
|
|
28
29
|
tokens-mdc-icon-button.get-color-tokens($theme)
|
|
29
30
|
);
|
|
30
31
|
|
|
31
|
-
$mat-tokens: if(
|
|
32
|
+
$mat-tokens: if(
|
|
33
|
+
$palette,
|
|
32
34
|
tokens-mat-icon-button.private-get-color-palette-color-tokens($theme, $palette),
|
|
33
35
|
tokens-mat-icon-button.get-color-tokens($theme)
|
|
34
36
|
);
|
|
@@ -44,8 +46,7 @@
|
|
|
44
46
|
@mixin color($theme, $options...) {
|
|
45
47
|
@if inspection.get-theme-version($theme) == 1 {
|
|
46
48
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
|
|
47
|
-
}
|
|
48
|
-
@else {
|
|
49
|
+
} @else {
|
|
49
50
|
@include sass-utils.current-selector-or-root() {
|
|
50
51
|
@include _icon-button-variant($theme, null);
|
|
51
52
|
|
|
@@ -69,11 +70,12 @@
|
|
|
69
70
|
@mixin typography($theme) {
|
|
70
71
|
@if inspection.get-theme-version($theme) == 1 {
|
|
71
72
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
|
|
72
|
-
}
|
|
73
|
-
@else {
|
|
73
|
+
} @else {
|
|
74
74
|
@include sass-utils.current-selector-or-root() {
|
|
75
|
-
@include token-utils.create-token-values(
|
|
76
|
-
tokens-mat-icon-button
|
|
75
|
+
@include token-utils.create-token-values(
|
|
76
|
+
tokens-mat-icon-button.$prefix,
|
|
77
|
+
tokens-mat-icon-button.get-typography-tokens($theme)
|
|
78
|
+
);
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
}
|
|
@@ -81,8 +83,7 @@
|
|
|
81
83
|
@mixin density($theme) {
|
|
82
84
|
@if inspection.get-theme-version($theme) == 1 {
|
|
83
85
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
|
|
84
|
-
}
|
|
85
|
-
@else {
|
|
86
|
+
} @else {
|
|
86
87
|
$icon-size: 24px;
|
|
87
88
|
$density-scale: inspection.get-theme-density($theme);
|
|
88
89
|
$size-map: (
|
|
@@ -96,8 +97,10 @@
|
|
|
96
97
|
$calculated-size: map.get($size-map, $density-scale);
|
|
97
98
|
|
|
98
99
|
@include sass-utils.current-selector-or-root() {
|
|
99
|
-
@include token-utils.create-token-values(
|
|
100
|
-
tokens-mat-icon-button
|
|
100
|
+
@include token-utils.create-token-values(
|
|
101
|
+
tokens-mat-icon-button.$prefix,
|
|
102
|
+
tokens-mat-icon-button.get-density-tokens($theme)
|
|
103
|
+
);
|
|
101
104
|
}
|
|
102
105
|
|
|
103
106
|
// Use `mat-mdc-button-base` to increase the specificity over the button's structural styles.
|
|
@@ -121,8 +124,14 @@
|
|
|
121
124
|
@mixin overrides($tokens: ()) {
|
|
122
125
|
@include token-utils.batch-create-token-values(
|
|
123
126
|
$tokens,
|
|
124
|
-
(
|
|
125
|
-
|
|
127
|
+
(
|
|
128
|
+
namespace: tokens-mdc-icon-button.$prefix,
|
|
129
|
+
tokens: tokens-mdc-icon-button.get-token-slots(),
|
|
130
|
+
),
|
|
131
|
+
(
|
|
132
|
+
namespace: tokens-mat-icon-button.$prefix,
|
|
133
|
+
tokens: tokens-mat-icon-button.get-token-slots(),
|
|
134
|
+
)
|
|
126
135
|
);
|
|
127
136
|
}
|
|
128
137
|
|
|
@@ -134,8 +143,7 @@
|
|
|
134
143
|
@include theming.private-check-duplicate-theme-styles($theme, 'mat-icon-button') {
|
|
135
144
|
@if inspection.get-theme-version($theme) == 1 {
|
|
136
145
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
|
|
137
|
-
}
|
|
138
|
-
@else {
|
|
146
|
+
} @else {
|
|
139
147
|
@include base($theme);
|
|
140
148
|
@if inspection.theme-has($theme, color) {
|
|
141
149
|
@include color($theme);
|
|
@@ -152,7 +160,8 @@
|
|
|
152
160
|
|
|
153
161
|
@mixin _theme-from-tokens($tokens, $options...) {
|
|
154
162
|
@include validation.selector-defined(
|
|
155
|
-
|
|
163
|
+
'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
|
|
164
|
+
);
|
|
156
165
|
@if ($tokens != ()) {
|
|
157
166
|
$mdc-tokens: token-utils.get-tokens-for($tokens, tokens-mdc-icon-button.$prefix, $options...);
|
|
158
167
|
$mat-tokens: token-utils.get-tokens-for($tokens, tokens-mat-icon-button.$prefix, $options...);
|
package/button/index.d.ts
CHANGED
|
@@ -71,7 +71,7 @@ declare class MatAnchorBase extends MatButtonBase implements OnInit, OnDestroy {
|
|
|
71
71
|
_haltDisabledEvents: (event: Event) => void;
|
|
72
72
|
protected _getAriaDisabled(): boolean;
|
|
73
73
|
static ɵfac: i0.ɵɵFactoryDeclaration<MatAnchorBase, never>;
|
|
74
|
-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatAnchorBase, never, never, { "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, never,
|
|
74
|
+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatAnchorBase, never, never, { "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, never, true, never>;
|
|
75
75
|
static ngAcceptInputType_tabIndex: unknown;
|
|
76
76
|
}
|
|
77
77
|
|
|
@@ -142,7 +142,7 @@ declare class MatButtonBase implements AfterViewInit, OnDestroy {
|
|
|
142
142
|
protected _getDisabledAttribute(): true | null;
|
|
143
143
|
private _updateRippleDisabled;
|
|
144
144
|
static ɵfac: i0.ɵɵFactoryDeclaration<MatButtonBase, never>;
|
|
145
|
-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatButtonBase, never, never, { "color": { "alias": "color"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "ariaDisabled": { "alias": "aria-disabled"; "required": false; }; "disabledInteractive": { "alias": "disabledInteractive"; "required": false; }; }, {}, never, never,
|
|
145
|
+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatButtonBase, never, never, { "color": { "alias": "color"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "ariaDisabled": { "alias": "aria-disabled"; "required": false; }; "disabledInteractive": { "alias": "disabledInteractive"; "required": false; }; }, {}, never, never, true, never>;
|
|
146
146
|
static ngAcceptInputType_disableRipple: unknown;
|
|
147
147
|
static ngAcceptInputType_disabled: unknown;
|
|
148
148
|
static ngAcceptInputType_ariaDisabled: unknown;
|
|
@@ -13,16 +13,15 @@
|
|
|
13
13
|
@mixin base($theme) {
|
|
14
14
|
@if inspection.get-theme-version($theme) == 1 {
|
|
15
15
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
|
|
16
|
-
}
|
|
17
|
-
@else {
|
|
16
|
+
} @else {
|
|
18
17
|
@include sass-utils.current-selector-or-root() {
|
|
19
18
|
@include token-utils.create-token-values(
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
tokens-mat-legacy-button-toggle.$prefix,
|
|
20
|
+
tokens-mat-legacy-button-toggle.get-unthemable-tokens()
|
|
22
21
|
);
|
|
23
22
|
@include token-utils.create-token-values(
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
24
|
+
tokens-mat-standard-button-toggle.get-unthemable-tokens()
|
|
26
25
|
);
|
|
27
26
|
}
|
|
28
27
|
}
|
|
@@ -36,13 +35,16 @@
|
|
|
36
35
|
@mixin color($theme, $options...) {
|
|
37
36
|
@if inspection.get-theme-version($theme) == 1 {
|
|
38
37
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
|
|
39
|
-
}
|
|
40
|
-
@else {
|
|
38
|
+
} @else {
|
|
41
39
|
@include sass-utils.current-selector-or-root() {
|
|
42
|
-
@include token-utils.create-token-values(
|
|
43
|
-
tokens-mat-legacy-button-toggle
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
@include token-utils.create-token-values(
|
|
41
|
+
tokens-mat-legacy-button-toggle.$prefix,
|
|
42
|
+
tokens-mat-legacy-button-toggle.get-color-tokens($theme)
|
|
43
|
+
);
|
|
44
|
+
@include token-utils.create-token-values(
|
|
45
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
46
|
+
tokens-mat-standard-button-toggle.get-color-tokens($theme)
|
|
47
|
+
);
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
}
|
|
@@ -52,13 +54,16 @@
|
|
|
52
54
|
@mixin typography($theme) {
|
|
53
55
|
@if inspection.get-theme-version($theme) == 1 {
|
|
54
56
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
|
|
55
|
-
}
|
|
56
|
-
@else {
|
|
57
|
+
} @else {
|
|
57
58
|
@include sass-utils.current-selector-or-root() {
|
|
58
|
-
@include token-utils.create-token-values(
|
|
59
|
-
tokens-mat-legacy-button-toggle
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
@include token-utils.create-token-values(
|
|
60
|
+
tokens-mat-legacy-button-toggle.$prefix,
|
|
61
|
+
tokens-mat-legacy-button-toggle.get-typography-tokens($theme)
|
|
62
|
+
);
|
|
63
|
+
@include token-utils.create-token-values(
|
|
64
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
65
|
+
tokens-mat-standard-button-toggle.get-typography-tokens($theme)
|
|
66
|
+
);
|
|
62
67
|
}
|
|
63
68
|
}
|
|
64
69
|
}
|
|
@@ -68,13 +73,16 @@
|
|
|
68
73
|
@mixin density($theme) {
|
|
69
74
|
@if inspection.get-theme-version($theme) == 1 {
|
|
70
75
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
|
|
71
|
-
}
|
|
72
|
-
@else {
|
|
76
|
+
} @else {
|
|
73
77
|
@include sass-utils.current-selector-or-root() {
|
|
74
|
-
@include token-utils.create-token-values(
|
|
75
|
-
tokens-mat-legacy-button-toggle
|
|
76
|
-
|
|
77
|
-
|
|
78
|
+
@include token-utils.create-token-values(
|
|
79
|
+
tokens-mat-legacy-button-toggle.$prefix,
|
|
80
|
+
tokens-mat-legacy-button-toggle.get-density-tokens($theme)
|
|
81
|
+
);
|
|
82
|
+
@include token-utils.create-token-values(
|
|
83
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
84
|
+
tokens-mat-standard-button-toggle.get-density-tokens($theme)
|
|
85
|
+
);
|
|
78
86
|
}
|
|
79
87
|
}
|
|
80
88
|
}
|
|
@@ -86,8 +94,15 @@
|
|
|
86
94
|
$standard-tokens: tokens-mat-standard-button-toggle.get-token-slots();
|
|
87
95
|
@include token-utils.batch-create-token-values(
|
|
88
96
|
$tokens,
|
|
89
|
-
(
|
|
90
|
-
|
|
97
|
+
(
|
|
98
|
+
namespace: tokens-mat-legacy-button-toggle.$prefix,
|
|
99
|
+
tokens: $legacy-tokens,
|
|
100
|
+
prefix: 'legacy-',
|
|
101
|
+
),
|
|
102
|
+
(
|
|
103
|
+
namespace: tokens-mat-standard-button-toggle.$prefix,
|
|
104
|
+
tokens: $standard-tokens,
|
|
105
|
+
)
|
|
91
106
|
);
|
|
92
107
|
}
|
|
93
108
|
|
|
@@ -100,8 +115,7 @@
|
|
|
100
115
|
@include theming.private-check-duplicate-theme-styles($theme, 'mat-button-toggle') {
|
|
101
116
|
@if inspection.get-theme-version($theme) == 1 {
|
|
102
117
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
|
|
103
|
-
}
|
|
104
|
-
@else {
|
|
118
|
+
} @else {
|
|
105
119
|
@include base($theme);
|
|
106
120
|
@if inspection.theme-has($theme, color) {
|
|
107
121
|
@include color($theme);
|
|
@@ -118,9 +132,15 @@
|
|
|
118
132
|
|
|
119
133
|
@mixin _theme-from-tokens($tokens, $options...) {
|
|
120
134
|
@include validation.selector-defined(
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
135
|
+
'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
|
|
136
|
+
);
|
|
137
|
+
$mat-standard-button-toggle-tokens: token-utils.get-tokens-for(
|
|
138
|
+
$tokens,
|
|
139
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
140
|
+
$options...
|
|
141
|
+
);
|
|
124
142
|
@include token-utils.create-token-values(
|
|
125
|
-
|
|
143
|
+
tokens-mat-standard-button-toggle.$prefix,
|
|
144
|
+
$mat-standard-button-toggle-tokens
|
|
145
|
+
);
|
|
126
146
|
}
|
package/card/_card-theme.scss
CHANGED
|
@@ -12,15 +12,20 @@
|
|
|
12
12
|
@mixin base($theme) {
|
|
13
13
|
@if inspection.get-theme-version($theme) == 1 {
|
|
14
14
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
|
|
15
|
-
}
|
|
16
|
-
@else {
|
|
15
|
+
} @else {
|
|
17
16
|
@include sass-utils.current-selector-or-root() {
|
|
18
17
|
@include token-utils.create-token-values(
|
|
19
|
-
|
|
18
|
+
tokens-mdc-elevated-card.$prefix,
|
|
19
|
+
tokens-mdc-elevated-card.get-unthemable-tokens()
|
|
20
|
+
);
|
|
20
21
|
@include token-utils.create-token-values(
|
|
21
|
-
|
|
22
|
+
tokens-mdc-outlined-card.$prefix,
|
|
23
|
+
tokens-mdc-outlined-card.get-unthemable-tokens()
|
|
24
|
+
);
|
|
22
25
|
@include token-utils.create-token-values(
|
|
23
|
-
|
|
26
|
+
tokens-mat-card.$prefix,
|
|
27
|
+
tokens-mat-card.get-unthemable-tokens()
|
|
28
|
+
);
|
|
24
29
|
}
|
|
25
30
|
}
|
|
26
31
|
}
|
|
@@ -28,15 +33,20 @@
|
|
|
28
33
|
@mixin color($theme) {
|
|
29
34
|
@if inspection.get-theme-version($theme) == 1 {
|
|
30
35
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
|
|
31
|
-
}
|
|
32
|
-
@else {
|
|
36
|
+
} @else {
|
|
33
37
|
@include sass-utils.current-selector-or-root() {
|
|
34
|
-
@include token-utils.create-token-values(
|
|
35
|
-
tokens-mdc-elevated-card
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
@include token-utils.create-token-values(
|
|
39
|
-
tokens-
|
|
38
|
+
@include token-utils.create-token-values(
|
|
39
|
+
tokens-mdc-elevated-card.$prefix,
|
|
40
|
+
tokens-mdc-elevated-card.get-color-tokens($theme)
|
|
41
|
+
);
|
|
42
|
+
@include token-utils.create-token-values(
|
|
43
|
+
tokens-mdc-outlined-card.$prefix,
|
|
44
|
+
tokens-mdc-outlined-card.get-color-tokens($theme)
|
|
45
|
+
);
|
|
46
|
+
@include token-utils.create-token-values(
|
|
47
|
+
tokens-mat-card.$prefix,
|
|
48
|
+
tokens-mat-card.get-color-tokens($theme)
|
|
49
|
+
);
|
|
40
50
|
}
|
|
41
51
|
}
|
|
42
52
|
}
|
|
@@ -44,15 +54,20 @@
|
|
|
44
54
|
@mixin typography($theme) {
|
|
45
55
|
@if inspection.get-theme-version($theme) == 1 {
|
|
46
56
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
|
|
47
|
-
}
|
|
48
|
-
@else {
|
|
57
|
+
} @else {
|
|
49
58
|
@include sass-utils.current-selector-or-root() {
|
|
50
59
|
@include token-utils.create-token-values(
|
|
51
|
-
tokens-mdc-elevated-card.$prefix,
|
|
60
|
+
tokens-mdc-elevated-card.$prefix,
|
|
61
|
+
tokens-mdc-elevated-card.get-typography-tokens($theme)
|
|
62
|
+
);
|
|
52
63
|
@include token-utils.create-token-values(
|
|
53
|
-
tokens-mdc-outlined-card.$prefix,
|
|
64
|
+
tokens-mdc-outlined-card.$prefix,
|
|
65
|
+
tokens-mdc-outlined-card.get-typography-tokens($theme)
|
|
66
|
+
);
|
|
54
67
|
@include token-utils.create-token-values(
|
|
55
|
-
tokens-mat-card.$prefix,
|
|
68
|
+
tokens-mat-card.$prefix,
|
|
69
|
+
tokens-mat-card.get-typography-tokens($theme)
|
|
70
|
+
);
|
|
56
71
|
}
|
|
57
72
|
}
|
|
58
73
|
}
|
|
@@ -60,15 +75,20 @@
|
|
|
60
75
|
@mixin density($theme) {
|
|
61
76
|
@if inspection.get-theme-version($theme) == 1 {
|
|
62
77
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
|
|
63
|
-
}
|
|
64
|
-
@else {
|
|
78
|
+
} @else {
|
|
65
79
|
@include sass-utils.current-selector-or-root() {
|
|
66
|
-
@include token-utils.create-token-values(
|
|
67
|
-
tokens-mdc-elevated-card
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
@include token-utils.create-token-values(
|
|
71
|
-
tokens-
|
|
80
|
+
@include token-utils.create-token-values(
|
|
81
|
+
tokens-mdc-elevated-card.$prefix,
|
|
82
|
+
tokens-mdc-elevated-card.get-density-tokens($theme)
|
|
83
|
+
);
|
|
84
|
+
@include token-utils.create-token-values(
|
|
85
|
+
tokens-mdc-outlined-card.$prefix,
|
|
86
|
+
tokens-mdc-outlined-card.get-density-tokens($theme)
|
|
87
|
+
);
|
|
88
|
+
@include token-utils.create-token-values(
|
|
89
|
+
tokens-mat-card.$prefix,
|
|
90
|
+
tokens-mat-card.get-density-tokens($theme)
|
|
91
|
+
);
|
|
72
92
|
}
|
|
73
93
|
}
|
|
74
94
|
}
|
|
@@ -76,9 +96,20 @@
|
|
|
76
96
|
@mixin overrides($tokens: ()) {
|
|
77
97
|
@include token-utils.batch-create-token-values(
|
|
78
98
|
$tokens,
|
|
79
|
-
(
|
|
80
|
-
|
|
81
|
-
|
|
99
|
+
(
|
|
100
|
+
namespace: tokens-mat-card.$prefix,
|
|
101
|
+
tokens: tokens-mat-card.get-token-slots(),
|
|
102
|
+
),
|
|
103
|
+
(
|
|
104
|
+
namespace: tokens-mdc-elevated-card.$prefix,
|
|
105
|
+
tokens: tokens-mdc-elevated-card.get-token-slots(),
|
|
106
|
+
prefix: 'elevated-',
|
|
107
|
+
),
|
|
108
|
+
(
|
|
109
|
+
namespace: tokens-mdc-outlined-card.$prefix,
|
|
110
|
+
tokens: tokens-mdc-outlined-card.get-token-slots(),
|
|
111
|
+
prefix: 'outlined-',
|
|
112
|
+
)
|
|
82
113
|
);
|
|
83
114
|
}
|
|
84
115
|
|
|
@@ -86,8 +117,7 @@
|
|
|
86
117
|
@include theming.private-check-duplicate-theme-styles($theme, 'mat-card') {
|
|
87
118
|
@if inspection.get-theme-version($theme) == 1 {
|
|
88
119
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme));
|
|
89
|
-
}
|
|
90
|
-
@else {
|
|
120
|
+
} @else {
|
|
91
121
|
@include base($theme);
|
|
92
122
|
@if inspection.theme-has($theme, color) {
|
|
93
123
|
@include color($theme);
|
|
@@ -104,13 +134,20 @@
|
|
|
104
134
|
|
|
105
135
|
@mixin _theme-from-tokens($tokens) {
|
|
106
136
|
@include validation.selector-defined(
|
|
107
|
-
|
|
137
|
+
'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
|
|
138
|
+
);
|
|
108
139
|
@if ($tokens != ()) {
|
|
109
140
|
@include token-utils.create-token-values(
|
|
110
|
-
|
|
141
|
+
tokens-mdc-elevated-card.$prefix,
|
|
142
|
+
map.get($tokens, tokens-mdc-elevated-card.$prefix)
|
|
143
|
+
);
|
|
111
144
|
@include token-utils.create-token-values(
|
|
112
|
-
|
|
145
|
+
tokens-mdc-outlined-card.$prefix,
|
|
146
|
+
map.get($tokens, tokens-mdc-outlined-card.$prefix)
|
|
147
|
+
);
|
|
113
148
|
@include token-utils.create-token-values(
|
|
114
|
-
|
|
149
|
+
tokens-mat-card.$prefix,
|
|
150
|
+
map.get($tokens, tokens-mat-card.$prefix)
|
|
151
|
+
);
|
|
115
152
|
}
|
|
116
153
|
}
|
|
@@ -51,13 +51,15 @@
|
|
|
51
51
|
&.mat-primary {
|
|
52
52
|
@include token-utils.create-token-values(
|
|
53
53
|
tokens-mdc-checkbox.$prefix,
|
|
54
|
-
tokens-mdc-checkbox.get-color-tokens($theme, primary)
|
|
54
|
+
tokens-mdc-checkbox.get-color-tokens($theme, primary)
|
|
55
|
+
);
|
|
55
56
|
}
|
|
56
57
|
|
|
57
58
|
&.mat-warn {
|
|
58
59
|
@include token-utils.create-token-values(
|
|
59
60
|
tokens-mdc-checkbox.$prefix,
|
|
60
|
-
tokens-mdc-checkbox.get-color-tokens($theme, warn)
|
|
61
|
+
tokens-mdc-checkbox.get-color-tokens($theme, warn)
|
|
62
|
+
);
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
}
|
|
@@ -109,11 +111,11 @@
|
|
|
109
111
|
@include token-utils.batch-create-token-values(
|
|
110
112
|
$tokens,
|
|
111
113
|
(
|
|
112
|
-
|
|
114
|
+
namespace: tokens-mat-checkbox.$prefix,
|
|
113
115
|
tokens: tokens-mat-checkbox.get-token-slots(),
|
|
114
116
|
),
|
|
115
117
|
(
|
|
116
|
-
|
|
118
|
+
namespace: tokens-mdc-checkbox.$prefix,
|
|
117
119
|
tokens: tokens-mdc-checkbox.get-token-slots(),
|
|
118
120
|
)
|
|
119
121
|
);
|
package/chips/_chips-theme.scss
CHANGED
|
@@ -13,13 +13,16 @@
|
|
|
13
13
|
@mixin base($theme) {
|
|
14
14
|
@if inspection.get-theme-version($theme) == 1 {
|
|
15
15
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
|
|
16
|
-
}
|
|
17
|
-
@else {
|
|
16
|
+
} @else {
|
|
18
17
|
.mat-mdc-standard-chip {
|
|
19
18
|
@include token-utils.create-token-values(
|
|
20
|
-
tokens-mdc-chip.$prefix,
|
|
19
|
+
tokens-mdc-chip.$prefix,
|
|
20
|
+
tokens-mdc-chip.get-unthemable-tokens()
|
|
21
|
+
);
|
|
21
22
|
@include token-utils.create-token-values(
|
|
22
|
-
tokens-mat-chip.$prefix,
|
|
23
|
+
tokens-mat-chip.$prefix,
|
|
24
|
+
tokens-mat-chip.get-unthemable-tokens()
|
|
25
|
+
);
|
|
23
26
|
}
|
|
24
27
|
}
|
|
25
28
|
}
|
|
@@ -32,35 +35,50 @@
|
|
|
32
35
|
@mixin color($theme, $options...) {
|
|
33
36
|
@if inspection.get-theme-version($theme) == 1 {
|
|
34
37
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
|
|
35
|
-
}
|
|
36
|
-
@else {
|
|
38
|
+
} @else {
|
|
37
39
|
.mat-mdc-standard-chip {
|
|
38
40
|
@include token-utils.create-token-values(
|
|
39
|
-
tokens-mdc-chip.$prefix,
|
|
41
|
+
tokens-mdc-chip.$prefix,
|
|
42
|
+
tokens-mdc-chip.get-color-tokens($theme)
|
|
43
|
+
);
|
|
40
44
|
@include token-utils.create-token-values(
|
|
41
|
-
tokens-mat-chip.$prefix,
|
|
45
|
+
tokens-mat-chip.$prefix,
|
|
46
|
+
tokens-mat-chip.get-color-tokens($theme)
|
|
47
|
+
);
|
|
42
48
|
|
|
43
49
|
&.mat-mdc-chip-selected,
|
|
44
50
|
&.mat-mdc-chip-highlighted {
|
|
45
51
|
&.mat-primary {
|
|
46
52
|
@include token-utils.create-token-values(
|
|
47
|
-
tokens-mdc-chip.$prefix,
|
|
53
|
+
tokens-mdc-chip.$prefix,
|
|
54
|
+
tokens-mdc-chip.get-color-tokens($theme, primary)
|
|
55
|
+
);
|
|
48
56
|
@include token-utils.create-token-values(
|
|
49
|
-
tokens-mat-chip.$prefix,
|
|
57
|
+
tokens-mat-chip.$prefix,
|
|
58
|
+
tokens-mat-chip.get-color-tokens($theme, primary)
|
|
59
|
+
);
|
|
50
60
|
}
|
|
51
61
|
|
|
52
62
|
&.mat-accent {
|
|
53
63
|
@include token-utils.create-token-values(
|
|
54
|
-
tokens-mdc-chip.$prefix,
|
|
64
|
+
tokens-mdc-chip.$prefix,
|
|
65
|
+
tokens-mdc-chip.get-color-tokens($theme, accent)
|
|
66
|
+
);
|
|
55
67
|
@include token-utils.create-token-values(
|
|
56
|
-
tokens-mat-chip.$prefix,
|
|
68
|
+
tokens-mat-chip.$prefix,
|
|
69
|
+
tokens-mat-chip.get-color-tokens($theme, accent)
|
|
70
|
+
);
|
|
57
71
|
}
|
|
58
72
|
|
|
59
73
|
&.mat-warn {
|
|
60
74
|
@include token-utils.create-token-values(
|
|
61
|
-
tokens-mdc-chip.$prefix,
|
|
75
|
+
tokens-mdc-chip.$prefix,
|
|
76
|
+
tokens-mdc-chip.get-color-tokens($theme, warn)
|
|
77
|
+
);
|
|
62
78
|
@include token-utils.create-token-values(
|
|
63
|
-
tokens-mat-chip.$prefix,
|
|
79
|
+
tokens-mat-chip.$prefix,
|
|
80
|
+
tokens-mat-chip.get-color-tokens($theme, warn)
|
|
81
|
+
);
|
|
64
82
|
}
|
|
65
83
|
}
|
|
66
84
|
}
|
|
@@ -72,13 +90,16 @@
|
|
|
72
90
|
@mixin typography($theme) {
|
|
73
91
|
@if inspection.get-theme-version($theme) == 1 {
|
|
74
92
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
|
|
75
|
-
}
|
|
76
|
-
@else {
|
|
93
|
+
} @else {
|
|
77
94
|
.mat-mdc-standard-chip {
|
|
78
95
|
@include token-utils.create-token-values(
|
|
79
|
-
tokens-mdc-chip.$prefix,
|
|
96
|
+
tokens-mdc-chip.$prefix,
|
|
97
|
+
tokens-mdc-chip.get-typography-tokens($theme)
|
|
98
|
+
);
|
|
80
99
|
@include token-utils.create-token-values(
|
|
81
|
-
tokens-mat-chip.$prefix,
|
|
100
|
+
tokens-mat-chip.$prefix,
|
|
101
|
+
tokens-mat-chip.get-typography-tokens($theme)
|
|
102
|
+
);
|
|
82
103
|
}
|
|
83
104
|
}
|
|
84
105
|
}
|
|
@@ -88,13 +109,16 @@
|
|
|
88
109
|
@mixin density($theme) {
|
|
89
110
|
@if inspection.get-theme-version($theme) == 1 {
|
|
90
111
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
|
|
91
|
-
}
|
|
92
|
-
@else {
|
|
112
|
+
} @else {
|
|
93
113
|
.mat-mdc-chip.mat-mdc-standard-chip {
|
|
94
114
|
@include token-utils.create-token-values(
|
|
95
|
-
tokens-mdc-chip.$prefix,
|
|
115
|
+
tokens-mdc-chip.$prefix,
|
|
116
|
+
tokens-mdc-chip.get-density-tokens($theme)
|
|
117
|
+
);
|
|
96
118
|
@include token-utils.create-token-values(
|
|
97
|
-
tokens-mat-chip.$prefix,
|
|
119
|
+
tokens-mat-chip.$prefix,
|
|
120
|
+
tokens-mat-chip.get-density-tokens($theme)
|
|
121
|
+
);
|
|
98
122
|
}
|
|
99
123
|
}
|
|
100
124
|
}
|
|
@@ -104,8 +128,14 @@
|
|
|
104
128
|
@mixin overrides($tokens: ()) {
|
|
105
129
|
@include token-utils.batch-create-token-values(
|
|
106
130
|
$tokens,
|
|
107
|
-
(
|
|
108
|
-
|
|
131
|
+
(
|
|
132
|
+
namespace: tokens-mdc-chip.$prefix,
|
|
133
|
+
tokens: tokens-mdc-chip.get-token-slots(),
|
|
134
|
+
),
|
|
135
|
+
(
|
|
136
|
+
namespace: tokens-mat-chip.$prefix,
|
|
137
|
+
tokens: tokens-mat-chip.get-token-slots(),
|
|
138
|
+
)
|
|
109
139
|
);
|
|
110
140
|
}
|
|
111
141
|
|
|
@@ -118,8 +148,7 @@
|
|
|
118
148
|
@include theming.private-check-duplicate-theme-styles($theme, 'mat-chips') {
|
|
119
149
|
@if inspection.get-theme-version($theme) == 1 {
|
|
120
150
|
@include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
|
|
121
|
-
}
|
|
122
|
-
@else {
|
|
151
|
+
} @else {
|
|
123
152
|
@include base($theme);
|
|
124
153
|
@if inspection.theme-has($theme, color) {
|
|
125
154
|
@include color($theme);
|
|
@@ -136,7 +165,8 @@
|
|
|
136
165
|
|
|
137
166
|
@mixin _theme-from-tokens($tokens, $options...) {
|
|
138
167
|
@include validation.selector-defined(
|
|
139
|
-
|
|
168
|
+
'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
|
|
169
|
+
);
|
|
140
170
|
$mdc-chip-tokens: token-utils.get-tokens-for($tokens, tokens-mdc-chip.$prefix, $options...);
|
|
141
171
|
$mat-chip-tokens: token-utils.get-tokens-for($tokens, tokens-mat-chip.$prefix, $options...);
|
|
142
172
|
@include token-utils.create-token-values(tokens-mdc-chip.$prefix, $mdc-chip-tokens);
|