1- @use ' ../material/core/color/all-color' as color-all-color ;
1+ @use ' ../material/core/color/all-color' ;
22@use ' ../material/core/density/private/all-density' as private-all-density ;
3- @use ' ../material/core/focus-indicators/focus-indicators' as focus-indicators-focus-indicators ;
4- @use ' ../material/core/theming/all-theme' as theming-all-theme ;
3+ @use ' ../material/core/focus-indicators/focus-indicators' ;
4+ @use ' ../material/core/focus-indicators/focus-indicators-theme' ;
5+ @use ' ../material/core/theming/all-theme' ;
56@use ' ../material-experimental/column-resize/column-resize' ;
67@use ' ../material-experimental/mdc-helpers/mdc-helpers' ;
7- @use ' ../material-experimental/mdc-helpers/focus-indicators' ;
8- @use ' ../material-experimental/mdc-color/all-color' ;
9- @use ' ../material-experimental/mdc-theming/all-theme' ;
8+ @use ' ../material-experimental/mdc-helpers/focus-indicators-theme' as mdc-focus-indicators-theme ;
9+ @use ' ../material-experimental/mdc-helpers/focus-indicators' as mdc-focus-indicators ;
10+ @use ' ../material-experimental/mdc-color/all-color' as mdc-all-color ;
11+ @use ' ../material-experimental/mdc-theming/all-theme' as mdc-all-theme ;
1012@use ' ../material-experimental/mdc-typography/all-typography' ;
1113@use ' ../material-experimental/mdc-density/all-density' ;
1214@use ' ../material-experimental/mdc-slider/slider-theme' ;
1921// Plus imports for other components in your app.
2022
2123// Define the default (light) theme.
22- $candy-app-primary : theming .palette (palette .$indigo );
23- $candy-app-accent : theming .palette (palette .$pink , A200 , A100 , A400 );
24- $candy-app-theme : theming .light-theme ((
25- // Define the default colors for our app.
26- color : (
27- primary: $candy-app-primary ,
28- accent: $candy-app-accent
29- ),
30- // Define the default typography for our app.
31- typography: all-typography .config (),
32- // Define the default density level for our app.
33- density: 0 ,
24+ $candy-app-primary : theming .define- palette (palette .$indigo-palette );
25+ $candy-app-accent : theming .define- palette (palette .$pink-palette , A200 , A100 , A400 );
26+ $candy-app-theme : theming .define- light-theme ((
27+ // Define the default colors for our app.
28+ color : (
29+ primary: $candy-app-primary ,
30+ accent: $candy-app-accent
31+ ),
32+ // Define the default typography for our app.
33+ typography: all-typography .define-typography- config (),
34+ // Define the default density level for our app.
35+ density: 0 ,
3436));
3537
3638// Include the common styles for Angular Material. We include this here so that you only
@@ -39,21 +41,21 @@ $candy-app-theme: theming.light-theme((
3941@include core .core ($candy-app-theme );
4042
4143// Include the default theme styles.
42- @include theming- all-theme .angular-material-theme ($candy-app-theme );
43- @include all-theme .angular-material- mdc-theme ($candy-app-theme );
44+ @include all-theme .all-component-themes ($candy-app-theme );
45+ @include mdc- all-theme .all- mdc-component-themes ($candy-app-theme );
4446@include column-resize .theme ($candy-app-theme );
4547@include popover-edit .theme ($candy-app-theme );
46- // We add this in manually for now, because it isn't included in `angular-material- mdc-theme `.
48+ // We add this in manually for now, because it isn't included in `all- mdc-component-themes `.
4749@include slider-theme .theme ($candy-app-theme );
4850
4951.demo-strong-focus {
5052 // Include base styles for strong focus indicators.
51- @include focus-indicators-focus-indicators .strong-focus-indicators ();
5253 @include focus-indicators .strong-focus-indicators ();
54+ @include mdc-focus-indicators .strong-focus-indicators ();
5355
5456 // Include the default theme for focus indicators.
55- @include focus-indicators-focus-indicators . strong-focus-indicators- theme ($candy-app-theme );
56- @include focus-indicators . strong- focus-indicators-theme ($candy-app-theme );
57+ @include focus-indicators-theme . theme ($candy-app-theme );
58+ @include mdc- focus-indicators-theme . theme ($candy-app-theme );
5759}
5860
5961// Include the alternative theme styles inside of a block with a CSS class. You can make this
@@ -62,23 +64,23 @@ $candy-app-theme: theming.light-theme((
6264// default theme.
6365.demo-unicorn-dark-theme {
6466 // Create the color palettes used in our dark theme.
65- $dark-primary : theming .palette (palette .$blue-grey );
66- $dark-accent : theming .palette (palette .$amber , A200 , A100 , A400 );
67- $dark-warn : theming .palette (palette .$deep-orange );
68- $dark-colors : theming .dark-theme ($dark-primary , $dark-accent , $dark-warn );
67+ $dark-primary : theming .define- palette (palette .$blue-grey-palette );
68+ $dark-accent : theming .define- palette (palette .$amber-palette , A200 , A100 , A400 );
69+ $dark-warn : theming .define- palette (palette .$deep-orange-palette );
70+ $dark-colors : theming .define- dark-theme ($dark-primary , $dark-accent , $dark-warn );
6971
7072 // Include the dark theme color styles.
71- @include color- all-color .angular-material-color ($dark-colors );
72- @include all-color .angular-material- mdc-color ($dark-colors );
73+ @include all-color .all-component-colors ($dark-colors );
74+ @include mdc- all-color .all- mdc-component-colors ($dark-colors );
7375 @include column-resize .color ($dark-colors );
7476 @include popover-edit .color ($dark-colors );
75- // We add this in manually for now, because it isn't included in `angular-material- mdc-theme `.
77+ // We add this in manually for now, because it isn't included in `all- mdc-component-themes `.
7678 @include slider-theme .color ($dark-colors );
7779
7880 // Include the dark theme colors for focus indicators.
7981 .demo-strong-focus {
80- @include focus-indicators-focus-indicators . strong-focus-indicators- color ($dark-colors );
81- @include focus-indicators . strong- focus-indicators-color ($dark-colors );
82+ @include focus-indicators-theme . color ($dark-colors );
83+ @include mdc- focus-indicators-theme . color ($dark-colors );
8284 }
8385}
8486
0 commit comments