Skip to content

Commit c24b84d

Browse files
committed
6. Fix any remaining CI issues
1 parent 8f626df commit c24b84d

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

src/material/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
@forward './chips/chips-theme' as chips-* show chips-theme, chips-color, chips-typography;
8080
@forward './datepicker/datepicker-theme' as datepicker-* show datepicker-theme, datepicker-color,
8181
datepicker-typography, datepicker-date-range-colors;
82-
@forward './legacy-dialog/dialog-theme' as legacy-dialog-* show legacy-dialog-theme, legacy-dialog-color, legacy-dialog-typography;
82+
@forward './legacy-dialog/dialog-theme' as legacy-dialog-* show legacy-dialog-theme,
83+
legacy-dialog-color, legacy-dialog-typography;
8384
@forward './dialog/dialog-theme' as dialog-* show dialog-theme, dialog-color, dialog-typography;
8485
@forward './dialog/dialog-legacy-padding' as dialog-* show dialog-legacy-padding;
8586
@forward './divider/divider-theme' as divider-* show divider-theme, divider-color,

src/material/dialog/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ng_test_library(
5858
exclude = ["**/*.e2e.spec.ts"],
5959
),
6060
deps = [
61-
":mdc-dialog",
61+
":dialog",
6262
"//src/cdk/a11y",
6363
"//src/cdk/bidi",
6464
"//src/cdk/dialog",

src/material/dialog/_dialog-theme.scss

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

6161
@mixin theme($theme-or-color-config) {
6262
$theme: theming.private-legacy-get-theme($theme-or-color-config);
63-
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-dialog') {
63+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-dialog') {
6464
$color: theming.get-color-config($theme);
6565
$density: theming.get-density-config($theme);
6666
$typography: theming.get-typography-config($theme);

src/material/legacy-dialog/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ng_test_library(
5757
exclude = ["**/*.e2e.spec.ts"],
5858
),
5959
deps = [
60-
":dialog",
60+
":legacy-dialog",
6161
"//src/cdk/a11y",
6262
"//src/cdk/bidi",
6363
"//src/cdk/keycodes",

src/material/legacy-dialog/_dialog-theme.scss

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

3030
@mixin theme($theme-or-color-config) {
3131
$theme: theming.private-legacy-get-theme($theme-or-color-config);
32-
@include theming.private-check-duplicate-theme-styles($theme, 'mat-dialog') {
32+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-legacy-dialog') {
3333
$color: theming.get-color-config($theme);
3434
$density: theming.get-density-config($theme);
3535
$typography: theming.get-typography-config($theme);

src/material/schematics/ng-generate/mdc-migration/rules/components/dialog/dialog-styles.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('dialog styles', () => {
2323
`
2424
@use '@angular/material' as mat;
2525
$theme: ();
26-
@include mat.legacy-dialog-theme($theme);
26+
@include mat.dialog-theme($theme);
2727
`,
2828
`
2929
@use '@angular/material' as mat;
@@ -56,8 +56,8 @@ describe('dialog styles', () => {
5656
@use '@angular/material' as mat;
5757
$light-theme: ();
5858
$dark-theme: ();
59-
@include mat.legacy-dialog-theme($light-theme);
60-
@include mat.legacy-dialog-theme($dark-theme);
59+
@include mat.dialog-theme($light-theme);
60+
@include mat.dialog-theme($dark-theme);
6161
`,
6262
`
6363
@use '@angular/material' as mat;
@@ -78,7 +78,7 @@ describe('dialog styles', () => {
7878
$theme: ();
7979
8080
81-
@include mat.legacy-dialog-theme($theme);
81+
@include mat.dialog-theme($theme);
8282
8383
8484
`,

src/material/schematics/ng-generate/mdc-migration/rules/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {CardTemplateMigrator} from './components/card/card-template';
1616
import {CheckboxStylesMigrator} from './components/checkbox/checkbox-styles';
1717
import {ChipsStylesMigrator} from './components/chips/chips-styles';
1818
import {ChipsTemplateMigrator} from './components/chips/chips-template';
19-
import {DialogStylesMigrator} from './components/legacy-dialog/dialog-styles';
19+
import {DialogStylesMigrator} from './components/dialog/dialog-styles';
2020
import {FormFieldStylesMigrator} from './components/form-field/form-field-styles';
2121
import {InputStylesMigrator} from './components/input/input-styles';
2222
import {ListStylesMigrator} from './components/list/list-styles';

src/material/schematics/ng-update/test-cases/v9/misc/material-imports_expected_output.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MatLegacyDialogContainer as DialogContainer } from '@angular/material/legacy-dialog';
1+
import { MatDialogContainer as DialogContainer } from '@angular/material/dialog';
22
import { MatAccordion, MatExpansionPanel, MatExpansionPanelHeader } from '@angular/material/expansion';
33
import { MAT_PROGRESS_SPINNER_DEFAULT_OPTIONS as SPINNER_DEFAULTS } from '@angular/material/progress-spinner';
44

0 commit comments

Comments
 (0)