Skip to content

Commit 68b9c67

Browse files
crisbetoandrewseguin
authored andcommitted
fixup! fix(material/core): reduce the number of module resolutions required for the legacy theming bundle
1 parent 7f17d61 commit 68b9c67

File tree

72 files changed

+302
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+302
-70
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
3-
@forward './autocomplete-legacy-index';
3+
@forward 'autocomplete-theme' hide color, theme, typography;
4+
@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density;
45

56
@import '../core/style/private';
67
@import '../core/theming/theming';

src/material/badge/_badge-theme.import.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/typography/typography-utils.import';
33
@forward '../../cdk/a11y/index.import';
4-
@forward './badge-legacy-index';
4+
@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
5+
color, theme, typography;
6+
@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;
57

68
@import '../core/theming/palette';
79
@import '../core/theming/theming';

src/material/bottom-sheet/_bottom-sheet-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward './bottom-sheet-legacy-index';
4+
@forward 'bottom-sheet-theme' hide color, theme, typography;
5+
@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;
56

67
@import '../core/style/private';
78
@import '../core/typography/typography-utils';

src/material/button-toggle/_button-toggle-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/density/private/compatibility.import';
4+
@forward 'button-toggle-variables' as mat-button-toggle-*;
45
@forward '../../cdk/a11y/index.import';
56
@forward '../core/typography/typography-utils.import';
6-
@forward './button-toggle-legacy-index';
7+
@forward 'button-toggle-theme' as mat-button-toggle-*;
78

89
@import '../../cdk/a11y';
910
@import '../core/style/private';

src/material/button/_button-base.import.scss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
@forward '../core/style/private.import';
22
@forward '../core/style/button-common.import';
3-
@forward './button-legacy-index';
3+
@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius,
4+
$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin,
5+
$mat-min-width, $mat-padding, mat-base;
6+
@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius,
7+
$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius,
8+
$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding,
9+
$mat-button-mini-fab-size, $mat-button-stroked-button-border-width,
10+
$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab,
11+
mat-button-raised-button;
12+
@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius,
13+
$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height,
14+
$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size,
15+
$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height,
16+
$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button;
417

518
@import '../core/style/variables';
619
@import '../core/style/elevation';

src/material/button/_button-theme.import.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/style/private.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward './button-legacy-index';
4+
@forward 'button-theme' hide color, theme, typography;
5+
@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density,
6+
mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color,
7+
mat-button-theme-property;
58

69
@import '../core/theming/theming';
710
@import '../core/style/private';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/style/private.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward './card-legacy-index';
4+
@forward 'card-theme' hide color, theme, typography;
5+
@forward 'card-theme' as mat-card-* hide mat-card-density;
56

67
@import '../core/theming/palette';
78
@import '../core/theming/theming';
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/typography/typography-utils.import';
3-
@forward './checkbox-legacy-index';
3+
@forward 'checkbox-theme' hide color, theme, typography;
4+
@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density;
45

56
@import '../core/theming/theming';
67
@import '../core/typography/typography-utils';

src/material/chips/_chips-theme.import.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward './chips-legacy-index';
4+
@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography;
5+
@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color,
6+
mat-density, mat-ripple-background, mat-theme, mat-typography;
7+
@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size,
8+
mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density,
9+
mat-chips-ripple-background;
510

611
@import '../core/style/private';
712
@import '../core/theming/palette';

src/material/core/_core-legacy-index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
mat-core-mdc-strong-focus-indicators-positioning;
77
@forward 'core-theme' as mat-core-*;
88

9-
@forward './theming/all-theme';
109
@forward './color/color-legacy-index';
1110
@forward './density/private/density-legacy-index';
1211
@forward './focus-indicators/focus-indicators-legacy-index';

src/material/core/_core.import.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@
4141
@forward '../sort/sort-theme.import';
4242
@forward '../tabs/tabs-theme.import';
4343
@forward 'typography/all-typography';
44-
@forward './core-legacy-index';
44+
@forward 'core' hide core;
45+
@forward 'core-theme' hide color, theme;
46+
@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning;
47+
@forward 'core-theme' as mat-* hide mat-color, mat-theme;
48+
@forward 'core' as mat-core-* hide mat-core-mdc-core,
49+
mat-core-mdc-strong-focus-indicators-positioning;
50+
@forward 'core-theme' as mat-core-*;
4551

4652
@import '../../cdk/overlay';
4753
@import '../../cdk/a11y';

src/material/core/color/_all-color.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@forward '../core' as mat-core-* hide mat-core-core;
4848
@forward '../core-theme' as mat-core-*;
4949
@forward '../theming/all-theme';
50-
@forward './color-legacy-index';
50+
@forward 'all-color';
5151

5252
@import '../theming/all-theme';
5353
@import '../theming/theming';

src/material/core/density/private/_all-density.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@forward '../../../tree/tree-theme.import';
66
@forward '../../../paginator/paginator-theme.import';
77
@forward '../../../form-field/form-field-theme.import';
8-
@forward './density-legacy-index';
8+
@forward 'all-density' hide all-component-densities;
99

1010
@import '../../theming/theming';
1111
@import '../../../expansion/expansion-theme';
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
@forward './density-legacy-index';
1+
@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles,
2+
private-density-legacy-compatibility, private-density-prop-value;
3+
@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale,
4+
$mat-minimum-scale, $mat-supported-scales;

src/material/core/focus-indicators/_focus-indicators.import.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ $mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
1414
@forward '../style/layout-common' as mat-*;
15-
@forward './focus-indicators-legacy-index';
15+
@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
16+
strong-focus-indicators;
17+
@forward 'focus-indicators-theme' hide color, theme;
18+
@forward 'focus-indicators' as mat-*;
19+
@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;
1620

1721
@import '../theming/theming';
1822
@import '../style/layout-common';

src/material/core/option/_optgroup-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ mat-line-typography-level;
1919
@forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
2020
mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
2121
mat-typography-letter-spacing;
22-
@forward './option-legacy-index';
22+
@forward 'optgroup-theme' hide color, theme, typography;
23+
@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density;
2324

2425
@import '../theming/palette';
2526
@import '../theming/theming';

src/material/core/option/_option-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ mat-line-typography-level;
1919
@forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
2020
mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
2121
mat-typography-letter-spacing;
22-
@forward './option-legacy-index';
22+
@forward 'option-theme' hide color, theme, typography;
23+
@forward 'option-theme' as mat-option-* hide mat-option-density;
2324

2425
@import '../theming/palette';
2526
@import '../theming/theming';

src/material/core/ripple/_ripple.import.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ $mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
1414
@forward '../../../cdk/a11y/index.import';
15-
@forward './ripple-legacy-index';
15+
@forward 'ripple' as mat-* hide $mat-color-opacity;
16+
@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple;
17+
@forward 'ripple-theme' as mat-ripple-*;
1618

1719
@import '../theming/theming';
1820
@import '../../../cdk/a11y';

src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
1111
$mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../../density/private/compatibility' as mat-*;
1313
@forward '../../theming/theming' as mat-*;
14-
@forward './pseudo-checkbox-legacy-index';
14+
@forward 'pseudo-checkbox-theme' hide color, theme, typography;
15+
@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density;
1516

1617
@import '../../theming/theming';
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
@forward './style-legacy-index';
1+
@forward 'vendor-prefixes';
2+
@forward 'button-common' as mat-button-*;
23

34
@import './vendor-prefixes';
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
@forward './style-legacy-index';
1+
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2+
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3+
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4+
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5+
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6+
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7+
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8+
$mat-z-index-fab;
9+
@forward 'checkbox-common' as mat-checkbox-*;
210

311
@import './variables';
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1-
@forward './style-legacy-index';
1+
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2+
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3+
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4+
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5+
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6+
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7+
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8+
$mat-z-index-fab;
9+
@forward 'elevation' hide $color, $opacity, $prefix, $transition-duration,
10+
$transition-timing-function, elevation, overridable-elevation, elevation-transition,
11+
private-transition-property-value;
12+
@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
13+
$mat-transition-timing-function, mat-get-ambient-map, mat-get-penumbra-map, mat-get-umbra-map;
14+
@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-get-ambient-map,
15+
mat-elevation-get-penumbra-map, mat-elevation-get-umbra-map, mat-elevation-overridable-elevation;
216

317
@import 'variables';

src/material/core/style/_form-common.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
1111
$mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
14-
@forward './style-legacy-index';
14+
@forward 'form-common' as mat-*;
1515

1616
@import '../theming/theming';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@forward './style-legacy-index';
1+
@forward 'layout-common' as mat-*;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
@forward './style-legacy-index';
1+
@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
2+
@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;

src/material/core/style/_menu-common.import.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
@forward './style-legacy-index';
1+
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2+
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3+
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4+
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5+
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6+
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7+
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8+
$mat-z-index-fab;
9+
@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
10+
@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;
11+
@forward 'layout-common' as mat-*;
12+
@forward 'vendor-prefixes';
13+
@forward 'menu-common' as mat-menu-*;
214

315
@import './variables';
416
@import './list-common';
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1-
@forward './style-legacy-index';
1+
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2+
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3+
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4+
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5+
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6+
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7+
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8+
$mat-z-index-fab;
9+
@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
10+
$mat-transition-timing-function, mat-transition, mat-transition-property-value;
11+
@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation,
12+
mat-elevation-overridable-elevation;
13+
@forward 'private' as mat-*;
214

315
@import './elevation';
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
@forward './style-legacy-index';
1+
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2+
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3+
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4+
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5+
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6+
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7+
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8+
$mat-z-index-fab;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@forward './style-legacy-index';
1+
@forward 'vendor-prefixes';

src/material/core/theming/_all-theme.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@forward '../core-theme' as mat-* hide mat-color, mat-theme;
4747
@forward '../core' as mat-core-* hide mat-core-core;
4848
@forward '../core-theme' as mat-core-*;
49-
@forward './theming-legacy-index';
49+
@forward 'all-theme';
5050

5151
@import '../core';
5252
@import '../../autocomplete/autocomplete-theme';
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
@forward './theming-legacy-index';
1+
@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette, $blue-grey-palette,
2+
$brown-palette, $cyan-palette, $dark-theme-background-palette, $dark-theme-foreground-palette,
3+
$deep-orange-palette, $deep-purple-palette, $gray-palette, $green-palette, $grey-palette,
4+
$indigo-palette, $light-blue-palette, $light-green-palette, $light-theme-background-palette,
5+
$light-theme-foreground-palette, $lime-palette, $orange-palette, $pink-palette, $purple-palette,
6+
$red-palette, $teal-palette, $yellow-palette;
7+
@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity,
8+
$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text,
9+
$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused,
10+
$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity,
11+
$mat-white-87-opacity;
12+
@forward 'palette-deprecated' as mat-*;

src/material/core/theming/_theming-legacy-index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ private-is-theme-object, private-legacy-get-theme;
1919
$mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density,
2020
mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme;
2121
@forward 'theming-deprecated' as mat-*;
22+
@forward 'all-theme';
Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1+
@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette,
2+
$blue-grey-palette, $brown-palette, $cyan-palette, $dark-theme-background-palette,
3+
$dark-theme-foreground-palette, $deep-orange-palette, $deep-purple-palette, $gray-palette,
4+
$green-palette, $grey-palette, $indigo-palette, $light-blue-palette, $light-green-palette,
5+
$light-theme-background-palette, $light-theme-foreground-palette, $lime-palette, $orange-palette,
6+
$pink-palette, $purple-palette, $red-palette, $teal-palette, $yellow-palette;
7+
@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity,
8+
$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text,
9+
$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused,
10+
$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity,
11+
$mat-white-87-opacity;
112
@forward '../density/private/compatibility' as mat-*;
2-
@forward './theming-legacy-index';
13+
@forward 'theming' hide $theme-ignore-duplication-warnings, get-color-from-palette,
14+
get-color-config, get-density-config, get-typography-config, define-palette, define-light-theme,
15+
define-dark-theme, private-check-duplicate-theme-styles,
16+
private-create-backwards-compatibility-theme, private-is-legacy-constructed-theme,
17+
private-is-theme-object, private-legacy-get-theme;
18+
@forward 'theming' as mat-* hide $mat-theme-duplicate-warning, $mat-theme-emitted-color,
19+
$mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density,
20+
mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme;
21+
@forward 'theming-deprecated' as mat-*;
322

423
@import 'palette';
524
@import '../density/private/compatibility';

src/material/core/typography/_all-typography.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@forward '../../tabs/tabs-theme.import';
3636
@forward '../option/option-theme.import';
3737
@forward '../option/optgroup-theme.import';
38-
@forward './typography-legacy-index';
38+
@forward 'all-typography';
3939

4040
@import './typography';
4141
@import '../../autocomplete/autocomplete-theme';
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
@forward './typography-legacy-index';
1+
@forward 'typography-utils' hide font-family, font-shorthand, font-size, font-weight, line-height,
2+
letter-spacing, typography-level;
3+
@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-get-type-value,
4+
mat-typography-level;
5+
@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family,
6+
mat-typography-font-size, mat-typography-font-weight, mat-typography-get-type-value,
7+
mat-typography-line-height, mat-typography-letter-spacing;
8+
@forward 'typography-deprecated' as mat-typography-*;
9+
@forward 'typography-utils-deprecated' as mat-typography-*;

0 commit comments

Comments
 (0)