File tree Expand file tree Collapse file tree 5 files changed +7
-4
lines changed Expand file tree Collapse file tree 5 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 42
42
// not possible as it would introduce a circular dependency for density because the `mat-core`
43
43
// mixin that is transitively loaded by the `all-theme` file, imports `all-density` which
44
44
// would then load `all-theme` again. This ultimately results a circular dependency.
45
+ @include private-all-unmigrated-component-densities ($config );
45
46
@include form-field-theme .density ($config );
46
47
@include input-theme .density ($config );
47
48
@include option-theme .density ($config );
48
49
@include optgroup-theme .density ($config );
49
50
@include select-theme .density ($config );
50
- @include private-all-unmigrated-component-densities ($config );
51
51
}
52
52
53
53
Original file line number Diff line number Diff line change 53
53
@include icon-theme .theme ($theme-or-color-config );
54
54
@include list-theme .theme ($theme-or-color-config );
55
55
@include menu-theme .theme ($theme-or-color-config );
56
+ // TODO: when migrating paginator, ensure that it is included *before* select.
56
57
@include paginator-theme .theme ($theme-or-color-config );
57
58
@include progress-spinner-theme .theme ($theme-or-color-config );
58
59
@include radio-theme .theme ($theme-or-color-config );
72
73
$dedupe-key : ' angular-material-theme' ;
73
74
@include theming .private-check-duplicate-theme-styles ($theme-or-color-config , $dedupe-key ) {
74
75
@include core-theme .theme ($theme-or-color-config );
76
+ @include private-all-unmigrated-component-themes ($theme-or-color-config );
75
77
@include card-theme .theme ($theme-or-color-config );
76
78
@include progress-bar-theme .theme ($theme-or-color-config );
77
79
@include tooltip-theme .theme ($theme-or-color-config );
78
80
@include form-field-theme .theme ($theme-or-color-config );
79
81
@include input-theme .theme ($theme-or-color-config );
80
82
@include select-theme .theme ($theme-or-color-config );
81
- @include private-all-unmigrated-component-themes ($theme-or-color-config );
82
83
}
83
84
}
84
85
Original file line number Diff line number Diff line change 39
39
40
40
@mixin private-all-unmigrated-component-typographies ($config ) {
41
41
@include badge-theme .typography ($config );
42
- @include typography .typography-hierarchy ($config );
43
42
@include autocomplete-theme .typography ($config );
44
43
@include bottom-sheet-theme .typography ($config );
45
44
@include button-theme .typography ($config );
54
53
@include grid-list-theme .typography ($config );
55
54
@include icon-theme .typography ($config );
56
55
@include menu-theme .typography ($config );
56
+ // TODO: when migrating paginator, ensure that it is included *before* select.
57
57
@include paginator-theme .typography ($config );
58
58
@include progress-spinner-theme .typography ($config );
59
59
@include radio-theme .typography ($config );
85
85
// not possible as it would introduce a circular dependency for typography because the `mat-core`
86
86
// mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
87
87
// would then load `all-theme` again. This ultimately results a circular dependency.
88
+ @include typography .typography-hierarchy ($config );
88
89
@include private-all-unmigrated-component-typographies ($config );
89
90
@include card-theme .typography ($config );
90
91
@include progress-bar-theme .typography ($config );
Original file line number Diff line number Diff line change 13
13
$dedupe-key : ' angular-material-legacy-theme' ;
14
14
@include theming .private-check-duplicate-theme-styles ($theme-or-color-config , $dedupe-key ) {
15
15
@include core-theme .theme ($theme-or-color-config );
16
+ @include all-theme .private-all-unmigrated-component-themes ($theme-or-color-config );
16
17
@include card-theme .theme ($theme-or-color-config );
17
18
@include progress-bar-theme .theme ($theme-or-color-config );
18
19
@include tooltip-theme .theme ($theme-or-color-config );
19
20
@include input-theme .theme ($theme-or-color-config );
20
21
@include form-field-theme .theme ($theme-or-color-config );
21
22
@include select-theme .theme ($theme-or-color-config );
22
- @include all-theme .private-all-unmigrated-component-themes ($theme-or-color-config );
23
23
}
24
24
}
25
25
Original file line number Diff line number Diff line change 26
26
// mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
27
27
// would then load `all-theme` again. This ultimately results a circular dependency.
28
28
29
+ @include typography .typography-hierarchy ($config );
29
30
@include all-typography .private-all-unmigrated-component-typographies ($config );
30
31
@include option-theme .typography ($config );
31
32
@include optgroup-theme .typography ($config );
You can’t perform that action at this time.
0 commit comments