Skip to content

Commit dbecb33

Browse files
committed
6. Fix any remaining CI issues
1 parent 680e521 commit dbecb33

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

src/material/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
@forward './button-toggle/button-toggle-theme' as button-toggle-* show button-toggle-theme,
7171
button-toggle-color, button-toggle-typography;
7272
@forward './card/card-theme' as card-* show card-theme, card-color, card-typography;
73-
@forward './legacy-card/card-theme' as legacy-card-* show legacy-card-theme, legacy-card-color, legacy-card-typography;
73+
@forward './legacy-card/card-theme' as legacy-card-* show legacy-card-theme, legacy-card-color,
74+
legacy-card-typography;
7475
@forward './checkbox/checkbox-theme' as checkbox-* show checkbox-theme, checkbox-color,
7576
checkbox-typography;
7677
@forward './chips/chips-theme' as chips-* show chips-theme, chips-color, chips-typography;

src/material/card/_card-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
@mixin theme($theme-or-color-config) {
5858
$theme: theming.private-legacy-get-theme($theme-or-color-config);
59-
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-card') {
59+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-card') {
6060
$color: theming.get-color-config($theme);
6161
$density: theming.get-density-config($theme);
6262
$typography: theming.get-typography-config($theme);

src/material/legacy-card/_card-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
@mixin theme($theme-or-color-config) {
5656
$theme: theming.private-legacy-get-theme($theme-or-color-config);
57-
@include theming.private-check-duplicate-theme-styles($theme, 'mat-card') {
57+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-legacy-card') {
5858
$color: theming.get-color-config($theme);
5959
$density: theming.get-density-config($theme);
6060
$typography: theming.get-typography-config($theme);

tools/stylelint/theme-mixin-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ function getComponentNameFromPath(filePath: string): string | null {
215215

216216
if (filePath.includes('material-experimental') && filePath.includes('mdc-')) {
217217
prefix = 'mat-mdc-';
218+
} else if (filePath.includes('material/legacy-')) {
219+
prefix = 'mat-legacy-';
218220
} else if (filePath.includes('material')) {
219221
prefix = 'mat-';
220222
}

0 commit comments

Comments
 (0)