From 68b9c670f01912a96c68dd3282b4b1282b41e808 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Mon, 17 May 2021 22:14:44 +0200 Subject: [PATCH] fixup! fix(material/core): reduce the number of module resolutions required for the legacy theming bundle --- .../_autocomplete-theme.import.scss | 3 ++- src/material/badge/_badge-theme.import.scss | 4 +++- .../_bottom-sheet-theme.import.scss | 3 ++- .../_button-toggle-theme.import.scss | 3 ++- src/material/button/_button-base.import.scss | 15 ++++++++++++- src/material/button/_button-theme.import.scss | 5 ++++- src/material/card/_card-theme.import.scss | 3 ++- .../checkbox/_checkbox-theme.import.scss | 3 ++- src/material/chips/_chips-theme.import.scss | 7 +++++- src/material/core/_core-legacy-index.scss | 1 - src/material/core/_core.import.scss | 8 ++++++- .../core/color/_all-color.import.scss | 2 +- .../density/private/_all-density.import.scss | 2 +- .../private/_compatibility.import.scss | 5 ++++- .../_focus-indicators.import.scss | 6 ++++- .../core/option/_optgroup-theme.import.scss | 3 ++- .../core/option/_option-theme.import.scss | 3 ++- src/material/core/ripple/_ripple.import.scss | 4 +++- .../_pseudo-checkbox-theme.import.scss | 3 ++- .../core/style/_button-common.import.scss | 3 ++- .../core/style/_checkbox-common.import.scss | 10 ++++++++- .../core/style/_elevation.import.scss | 16 ++++++++++++- .../core/style/_form-common.import.scss | 2 +- .../core/style/_layout-common.import.scss | 2 +- .../core/style/_list-common.import.scss | 3 ++- .../core/style/_menu-common.import.scss | 14 +++++++++++- src/material/core/style/_private.import.scss | 14 +++++++++++- .../core/style/_variables.import.scss | 9 +++++++- .../core/style/_vendor-prefixes.import.scss | 2 +- .../core/theming/_all-theme.import.scss | 2 +- .../core/theming/_palette.import.scss | 13 ++++++++++- .../core/theming/_theming-legacy-index.scss | 1 + .../core/theming/_theming.import.scss | 21 +++++++++++++++++- .../typography/_all-typography.import.scss | 2 +- .../typography/_typography-utils.import.scss | 10 ++++++++- .../core/typography/_typography.import.scss | 14 +++++++++++- .../datepicker/_datepicker-theme.import.scss | 10 ++++++++- src/material/dialog/_dialog-theme.import.scss | 3 ++- .../divider/_divider-offset.import.scss | 2 +- .../divider/_divider-theme.import.scss | 3 ++- .../expansion/_expansion-theme.import.scss | 4 +++- src/material/form-field/.form-field.md.swp | Bin 0 -> 16384 bytes .../_form-field-fill-theme.import.scss | 7 +++++- .../_form-field-legacy-theme.import.scss | 7 +++++- .../_form-field-outline-theme.import.scss | 7 +++++- .../_form-field-standard-theme.import.scss | 5 ++++- .../form-field/_form-field-theme.import.scss | 20 ++++++++++++++++- .../grid-list/_grid-list-theme.import.scss | 3 ++- src/material/icon/_icon-theme.import.scss | 3 ++- src/material/input/_input-theme.import.scss | 3 ++- src/material/list/_list-theme.import.scss | 3 ++- src/material/menu/_menu-theme.import.scss | 3 ++- .../paginator/_paginator-theme.import.scss | 3 ++- .../_progress-bar-theme.import.scss | 3 ++- .../_progress-spinner-theme.import.scss | 3 ++- src/material/radio/_radio-theme.import.scss | 3 ++- src/material/select/_select-theme.import.scss | 3 ++- .../sidenav/_sidenav-theme.import.scss | 3 ++- .../_slide-toggle-theme.import.scss | 4 +++- src/material/slider/_slider-theme.import.scss | 3 ++- .../snack-bar/_snack-bar-theme.import.scss | 3 ++- src/material/sort/_sort-theme.import.scss | 3 ++- .../stepper/_stepper-theme.import.scss | 8 ++++++- .../table/_table-flex-styles.import.scss | 2 +- src/material/table/_table-theme.import.scss | 3 ++- src/material/tabs/_tabs-common.import.scss | 4 +++- src/material/tabs/_tabs-theme.import.scss | 4 +++- .../toolbar/_toolbar-theme.import.scss | 5 ++++- .../toolbar/_toolbar-variables.import.scss | 2 +- .../tooltip/_tooltip-theme.import.scss | 4 +++- src/material/tree/_tree-theme.import.scss | 3 ++- src/material/tree/_tree-variables.import.scss | 2 +- 72 files changed, 302 insertions(+), 70 deletions(-) create mode 100644 src/material/form-field/.form-field.md.swp diff --git a/src/material/autocomplete/_autocomplete-theme.import.scss b/src/material/autocomplete/_autocomplete-theme.import.scss index 709af0776d8b..a0833d90ec77 100644 --- a/src/material/autocomplete/_autocomplete-theme.import.scss +++ b/src/material/autocomplete/_autocomplete-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; -@forward './autocomplete-legacy-index'; +@forward 'autocomplete-theme' hide color, theme, typography; +@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density; @import '../core/style/private'; @import '../core/theming/theming'; diff --git a/src/material/badge/_badge-theme.import.scss b/src/material/badge/_badge-theme.import.scss index 093060f842d1..653f5925701c 100644 --- a/src/material/badge/_badge-theme.import.scss +++ b/src/material/badge/_badge-theme.import.scss @@ -1,7 +1,9 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; @forward '../../cdk/a11y/index.import'; -@forward './badge-legacy-index'; +@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size, +color, theme, typography; +@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/bottom-sheet/_bottom-sheet-theme.import.scss b/src/material/bottom-sheet/_bottom-sheet-theme.import.scss index 31c9a1c12ace..3dec4322c29b 100644 --- a/src/material/bottom-sheet/_bottom-sheet-theme.import.scss +++ b/src/material/bottom-sheet/_bottom-sheet-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './bottom-sheet-legacy-index'; +@forward 'bottom-sheet-theme' hide color, theme, typography; +@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density; @import '../core/style/private'; @import '../core/typography/typography-utils'; diff --git a/src/material/button-toggle/_button-toggle-theme.import.scss b/src/material/button-toggle/_button-toggle-theme.import.scss index 6530b25af604..f5c81d68d29c 100644 --- a/src/material/button-toggle/_button-toggle-theme.import.scss +++ b/src/material/button-toggle/_button-toggle-theme.import.scss @@ -1,9 +1,10 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/density/private/compatibility.import'; +@forward 'button-toggle-variables' as mat-button-toggle-*; @forward '../../cdk/a11y/index.import'; @forward '../core/typography/typography-utils.import'; -@forward './button-toggle-legacy-index'; +@forward 'button-toggle-theme' as mat-button-toggle-*; @import '../../cdk/a11y'; @import '../core/style/private'; diff --git a/src/material/button/_button-base.import.scss b/src/material/button/_button-base.import.scss index e5b0f496d224..52ec6868bf1d 100644 --- a/src/material/button/_button-base.import.scss +++ b/src/material/button/_button-base.import.scss @@ -1,6 +1,19 @@ @forward '../core/style/private.import'; @forward '../core/style/button-common.import'; -@forward './button-legacy-index'; +@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius, +$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin, +$mat-min-width, $mat-padding, mat-base; +@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius, +$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius, +$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding, +$mat-button-mini-fab-size, $mat-button-stroked-button-border-width, +$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab, +mat-button-raised-button; +@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius, +$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height, +$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size, +$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height, +$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button; @import '../core/style/variables'; @import '../core/style/elevation'; diff --git a/src/material/button/_button-theme.import.scss b/src/material/button/_button-theme.import.scss index 5fd81e09cf79..a77aad6a26a3 100644 --- a/src/material/button/_button-theme.import.scss +++ b/src/material/button/_button-theme.import.scss @@ -1,7 +1,10 @@ @forward '../core/theming/theming.import'; @forward '../core/style/private.import'; @forward '../core/typography/typography-utils.import'; -@forward './button-legacy-index'; +@forward 'button-theme' hide color, theme, typography; +@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density, +mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color, +mat-button-theme-property; @import '../core/theming/theming'; @import '../core/style/private'; diff --git a/src/material/card/_card-theme.import.scss b/src/material/card/_card-theme.import.scss index d117465a9e39..71ff57e208a6 100644 --- a/src/material/card/_card-theme.import.scss +++ b/src/material/card/_card-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/style/private.import'; @forward '../core/typography/typography-utils.import'; -@forward './card-legacy-index'; +@forward 'card-theme' hide color, theme, typography; +@forward 'card-theme' as mat-card-* hide mat-card-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/checkbox/_checkbox-theme.import.scss b/src/material/checkbox/_checkbox-theme.import.scss index ed183e6f1d34..13bf2ce0d1d0 100644 --- a/src/material/checkbox/_checkbox-theme.import.scss +++ b/src/material/checkbox/_checkbox-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './checkbox-legacy-index'; +@forward 'checkbox-theme' hide color, theme, typography; +@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density; @import '../core/theming/theming'; @import '../core/typography/typography-utils'; diff --git a/src/material/chips/_chips-theme.import.scss b/src/material/chips/_chips-theme.import.scss index bb3342c8df9d..a03aa8abd053 100644 --- a/src/material/chips/_chips-theme.import.scss +++ b/src/material/chips/_chips-theme.import.scss @@ -1,7 +1,12 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './chips-legacy-index'; +@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography; +@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color, +mat-density, mat-ripple-background, mat-theme, mat-typography; +@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size, +mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density, +mat-chips-ripple-background; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/core/_core-legacy-index.scss b/src/material/core/_core-legacy-index.scss index 89c8140deb7c..adc2e4685bf7 100644 --- a/src/material/core/_core-legacy-index.scss +++ b/src/material/core/_core-legacy-index.scss @@ -6,7 +6,6 @@ mat-core-mdc-strong-focus-indicators-positioning; @forward 'core-theme' as mat-core-*; -@forward './theming/all-theme'; @forward './color/color-legacy-index'; @forward './density/private/density-legacy-index'; @forward './focus-indicators/focus-indicators-legacy-index'; diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss index d1d9071f7b27..47828eb6d0fe 100644 --- a/src/material/core/_core.import.scss +++ b/src/material/core/_core.import.scss @@ -41,7 +41,13 @@ @forward '../sort/sort-theme.import'; @forward '../tabs/tabs-theme.import'; @forward 'typography/all-typography'; -@forward './core-legacy-index'; +@forward 'core' hide core; +@forward 'core-theme' hide color, theme; +@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning; +@forward 'core-theme' as mat-* hide mat-color, mat-theme; +@forward 'core' as mat-core-* hide mat-core-mdc-core, +mat-core-mdc-strong-focus-indicators-positioning; +@forward 'core-theme' as mat-core-*; @import '../../cdk/overlay'; @import '../../cdk/a11y'; diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss index 03cc7ef0549e..3a2579da41f9 100644 --- a/src/material/core/color/_all-color.import.scss +++ b/src/material/core/color/_all-color.import.scss @@ -47,7 +47,7 @@ @forward '../core' as mat-core-* hide mat-core-core; @forward '../core-theme' as mat-core-*; @forward '../theming/all-theme'; -@forward './color-legacy-index'; +@forward 'all-color'; @import '../theming/all-theme'; @import '../theming/theming'; diff --git a/src/material/core/density/private/_all-density.import.scss b/src/material/core/density/private/_all-density.import.scss index a3247e6481a1..fe9ebd5a3925 100644 --- a/src/material/core/density/private/_all-density.import.scss +++ b/src/material/core/density/private/_all-density.import.scss @@ -5,7 +5,7 @@ @forward '../../../tree/tree-theme.import'; @forward '../../../paginator/paginator-theme.import'; @forward '../../../form-field/form-field-theme.import'; -@forward './density-legacy-index'; +@forward 'all-density' hide all-component-densities; @import '../../theming/theming'; @import '../../../expansion/expansion-theme'; diff --git a/src/material/core/density/private/_compatibility.import.scss b/src/material/core/density/private/_compatibility.import.scss index f6784df90bcb..f68d97510308 100644 --- a/src/material/core/density/private/_compatibility.import.scss +++ b/src/material/core/density/private/_compatibility.import.scss @@ -1 +1,4 @@ -@forward './density-legacy-index'; +@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles, +private-density-legacy-compatibility, private-density-prop-value; +@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale, +$mat-minimum-scale, $mat-supported-scales; diff --git a/src/material/core/focus-indicators/_focus-indicators.import.scss b/src/material/core/focus-indicators/_focus-indicators.import.scss index 04674c9b02c8..6482e0959bf2 100644 --- a/src/material/core/focus-indicators/_focus-indicators.import.scss +++ b/src/material/core/focus-indicators/_focus-indicators.import.scss @@ -12,7 +12,11 @@ $mat-white-6-opacity, $mat-white-87-opacity; @forward '../density/private/compatibility' as mat-*; @forward '../theming/theming' as mat-*; @forward '../style/layout-common' as mat-*; -@forward './focus-indicators-legacy-index'; +@forward 'focus-indicators' hide private-strong-focus-indicators-positioning, +strong-focus-indicators; +@forward 'focus-indicators-theme' hide color, theme; +@forward 'focus-indicators' as mat-*; +@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*; @import '../theming/theming'; @import '../style/layout-common'; diff --git a/src/material/core/option/_optgroup-theme.import.scss b/src/material/core/option/_optgroup-theme.import.scss index da25d43cb577..e82cba3a656b 100644 --- a/src/material/core/option/_optgroup-theme.import.scss +++ b/src/material/core/option/_optgroup-theme.import.scss @@ -19,7 +19,8 @@ mat-line-typography-level; @forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family, mat-typography-font-size, mat-typography-font-weight, mat-typography-height, mat-typography-letter-spacing; -@forward './option-legacy-index'; +@forward 'optgroup-theme' hide color, theme, typography; +@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density; @import '../theming/palette'; @import '../theming/theming'; diff --git a/src/material/core/option/_option-theme.import.scss b/src/material/core/option/_option-theme.import.scss index da25d43cb577..0f37a50d9e88 100644 --- a/src/material/core/option/_option-theme.import.scss +++ b/src/material/core/option/_option-theme.import.scss @@ -19,7 +19,8 @@ mat-line-typography-level; @forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family, mat-typography-font-size, mat-typography-font-weight, mat-typography-height, mat-typography-letter-spacing; -@forward './option-legacy-index'; +@forward 'option-theme' hide color, theme, typography; +@forward 'option-theme' as mat-option-* hide mat-option-density; @import '../theming/palette'; @import '../theming/theming'; diff --git a/src/material/core/ripple/_ripple.import.scss b/src/material/core/ripple/_ripple.import.scss index 50628c388925..ee7566d664d2 100644 --- a/src/material/core/ripple/_ripple.import.scss +++ b/src/material/core/ripple/_ripple.import.scss @@ -12,7 +12,9 @@ $mat-white-6-opacity, $mat-white-87-opacity; @forward '../density/private/compatibility' as mat-*; @forward '../theming/theming' as mat-*; @forward '../../../cdk/a11y/index.import'; -@forward './ripple-legacy-index'; +@forward 'ripple' as mat-* hide $mat-color-opacity; +@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple; +@forward 'ripple-theme' as mat-ripple-*; @import '../theming/theming'; @import '../../../cdk/a11y'; diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss index f7d8e4cd9aaa..827a272949e8 100644 --- a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss +++ b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss @@ -11,6 +11,7 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi $mat-white-6-opacity, $mat-white-87-opacity; @forward '../../density/private/compatibility' as mat-*; @forward '../../theming/theming' as mat-*; -@forward './pseudo-checkbox-legacy-index'; +@forward 'pseudo-checkbox-theme' hide color, theme, typography; +@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density; @import '../../theming/theming'; diff --git a/src/material/core/style/_button-common.import.scss b/src/material/core/style/_button-common.import.scss index ed55ad5003e8..092eeac484bc 100644 --- a/src/material/core/style/_button-common.import.scss +++ b/src/material/core/style/_button-common.import.scss @@ -1,3 +1,4 @@ -@forward './style-legacy-index'; +@forward 'vendor-prefixes'; +@forward 'button-common' as mat-button-*; @import './vendor-prefixes'; diff --git a/src/material/core/style/_checkbox-common.import.scss b/src/material/core/style/_checkbox-common.import.scss index 5080a7da98e4..2f12a6a12cdc 100644 --- a/src/material/core/style/_checkbox-common.import.scss +++ b/src/material/core/style/_checkbox-common.import.scss @@ -1,3 +1,11 @@ -@forward './style-legacy-index'; +@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function, +$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall; +@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in, +$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration, +$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out, +$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear, +$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer, +$mat-z-index-fab; +@forward 'checkbox-common' as mat-checkbox-*; @import './variables'; diff --git a/src/material/core/style/_elevation.import.scss b/src/material/core/style/_elevation.import.scss index ef957a52d7f1..63d3fc138176 100644 --- a/src/material/core/style/_elevation.import.scss +++ b/src/material/core/style/_elevation.import.scss @@ -1,3 +1,17 @@ -@forward './style-legacy-index'; +@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function, +$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall; +@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in, +$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration, +$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out, +$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear, +$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer, +$mat-z-index-fab; +@forward 'elevation' hide $color, $opacity, $prefix, $transition-duration, +$transition-timing-function, elevation, overridable-elevation, elevation-transition, +private-transition-property-value; +@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration, +$mat-transition-timing-function, mat-get-ambient-map, mat-get-penumbra-map, mat-get-umbra-map; +@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-get-ambient-map, +mat-elevation-get-penumbra-map, mat-elevation-get-umbra-map, mat-elevation-overridable-elevation; @import 'variables'; diff --git a/src/material/core/style/_form-common.import.scss b/src/material/core/style/_form-common.import.scss index 45a925b6b4e6..7611d8844647 100644 --- a/src/material/core/style/_form-common.import.scss +++ b/src/material/core/style/_form-common.import.scss @@ -11,6 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi $mat-white-6-opacity, $mat-white-87-opacity; @forward '../density/private/compatibility' as mat-*; @forward '../theming/theming' as mat-*; -@forward './style-legacy-index'; +@forward 'form-common' as mat-*; @import '../theming/theming'; diff --git a/src/material/core/style/_layout-common.import.scss b/src/material/core/style/_layout-common.import.scss index 76db941f8e3d..652b5d5efa52 100644 --- a/src/material/core/style/_layout-common.import.scss +++ b/src/material/core/style/_layout-common.import.scss @@ -1 +1 @@ -@forward './style-legacy-index'; +@forward 'layout-common' as mat-*; diff --git a/src/material/core/style/_list-common.import.scss b/src/material/core/style/_list-common.import.scss index 76db941f8e3d..6b641e614a11 100644 --- a/src/material/core/style/_list-common.import.scss +++ b/src/material/core/style/_list-common.import.scss @@ -1 +1,2 @@ -@forward './style-legacy-index'; +@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base; +@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line; diff --git a/src/material/core/style/_menu-common.import.scss b/src/material/core/style/_menu-common.import.scss index c3d68af10b4d..c0c19d9bcf65 100644 --- a/src/material/core/style/_menu-common.import.scss +++ b/src/material/core/style/_menu-common.import.scss @@ -1,4 +1,16 @@ -@forward './style-legacy-index'; +@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function, +$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall; +@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in, +$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration, +$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out, +$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear, +$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer, +$mat-z-index-fab; +@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base; +@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line; +@forward 'layout-common' as mat-*; +@forward 'vendor-prefixes'; +@forward 'menu-common' as mat-menu-*; @import './variables'; @import './list-common'; diff --git a/src/material/core/style/_private.import.scss b/src/material/core/style/_private.import.scss index b5ab93edb689..4a0d646c3120 100644 --- a/src/material/core/style/_private.import.scss +++ b/src/material/core/style/_private.import.scss @@ -1,3 +1,15 @@ -@forward './style-legacy-index'; +@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function, +$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall; +@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in, +$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration, +$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out, +$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear, +$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer, +$mat-z-index-fab; +@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration, +$mat-transition-timing-function, mat-transition, mat-transition-property-value; +@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, +mat-elevation-overridable-elevation; +@forward 'private' as mat-*; @import './elevation'; diff --git a/src/material/core/style/_variables.import.scss b/src/material/core/style/_variables.import.scss index 76db941f8e3d..0571591622ee 100644 --- a/src/material/core/style/_variables.import.scss +++ b/src/material/core/style/_variables.import.scss @@ -1 +1,8 @@ -@forward './style-legacy-index'; +@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function, +$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall; +@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in, +$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration, +$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out, +$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear, +$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer, +$mat-z-index-fab; diff --git a/src/material/core/style/_vendor-prefixes.import.scss b/src/material/core/style/_vendor-prefixes.import.scss index 76db941f8e3d..3d57e24440f0 100644 --- a/src/material/core/style/_vendor-prefixes.import.scss +++ b/src/material/core/style/_vendor-prefixes.import.scss @@ -1 +1 @@ -@forward './style-legacy-index'; +@forward 'vendor-prefixes'; diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss index b49d45b75c7e..bbf7e7f93643 100644 --- a/src/material/core/theming/_all-theme.import.scss +++ b/src/material/core/theming/_all-theme.import.scss @@ -46,7 +46,7 @@ @forward '../core-theme' as mat-* hide mat-color, mat-theme; @forward '../core' as mat-core-* hide mat-core-core; @forward '../core-theme' as mat-core-*; -@forward './theming-legacy-index'; +@forward 'all-theme'; @import '../core'; @import '../../autocomplete/autocomplete-theme'; diff --git a/src/material/core/theming/_palette.import.scss b/src/material/core/theming/_palette.import.scss index 51f71236f486..7dbb18f25fb1 100644 --- a/src/material/core/theming/_palette.import.scss +++ b/src/material/core/theming/_palette.import.scss @@ -1 +1,12 @@ -@forward './theming-legacy-index'; +@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette, $blue-grey-palette, +$brown-palette, $cyan-palette, $dark-theme-background-palette, $dark-theme-foreground-palette, +$deep-orange-palette, $deep-purple-palette, $gray-palette, $green-palette, $grey-palette, +$indigo-palette, $light-blue-palette, $light-green-palette, $light-theme-background-palette, +$light-theme-foreground-palette, $lime-palette, $orange-palette, $pink-palette, $purple-palette, +$red-palette, $teal-palette, $yellow-palette; +@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity, +$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text, +$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, +$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, +$mat-white-87-opacity; +@forward 'palette-deprecated' as mat-*; diff --git a/src/material/core/theming/_theming-legacy-index.scss b/src/material/core/theming/_theming-legacy-index.scss index f8ad0b57bfad..1975999115b3 100644 --- a/src/material/core/theming/_theming-legacy-index.scss +++ b/src/material/core/theming/_theming-legacy-index.scss @@ -19,3 +19,4 @@ private-is-theme-object, private-legacy-get-theme; $mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density, mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme; @forward 'theming-deprecated' as mat-*; +@forward 'all-theme'; diff --git a/src/material/core/theming/_theming.import.scss b/src/material/core/theming/_theming.import.scss index eae311ddb75b..80ab9c8a419a 100644 --- a/src/material/core/theming/_theming.import.scss +++ b/src/material/core/theming/_theming.import.scss @@ -1,5 +1,24 @@ +@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette, +$blue-grey-palette, $brown-palette, $cyan-palette, $dark-theme-background-palette, +$dark-theme-foreground-palette, $deep-orange-palette, $deep-purple-palette, $gray-palette, +$green-palette, $grey-palette, $indigo-palette, $light-blue-palette, $light-green-palette, +$light-theme-background-palette, $light-theme-foreground-palette, $lime-palette, $orange-palette, +$pink-palette, $purple-palette, $red-palette, $teal-palette, $yellow-palette; +@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity, +$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text, +$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, +$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, +$mat-white-87-opacity; @forward '../density/private/compatibility' as mat-*; -@forward './theming-legacy-index'; +@forward 'theming' hide $theme-ignore-duplication-warnings, get-color-from-palette, +get-color-config, get-density-config, get-typography-config, define-palette, define-light-theme, +define-dark-theme, private-check-duplicate-theme-styles, +private-create-backwards-compatibility-theme, private-is-legacy-constructed-theme, +private-is-theme-object, private-legacy-get-theme; +@forward 'theming' as mat-* hide $mat-theme-duplicate-warning, $mat-theme-emitted-color, +$mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density, +mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme; +@forward 'theming-deprecated' as mat-*; @import 'palette'; @import '../density/private/compatibility'; diff --git a/src/material/core/typography/_all-typography.import.scss b/src/material/core/typography/_all-typography.import.scss index 3e0272146388..0a2350eecd00 100644 --- a/src/material/core/typography/_all-typography.import.scss +++ b/src/material/core/typography/_all-typography.import.scss @@ -35,7 +35,7 @@ @forward '../../tabs/tabs-theme.import'; @forward '../option/option-theme.import'; @forward '../option/optgroup-theme.import'; -@forward './typography-legacy-index'; +@forward 'all-typography'; @import './typography'; @import '../../autocomplete/autocomplete-theme'; diff --git a/src/material/core/typography/_typography-utils.import.scss b/src/material/core/typography/_typography-utils.import.scss index 64345c96c9af..90f10e1d8822 100644 --- a/src/material/core/typography/_typography-utils.import.scss +++ b/src/material/core/typography/_typography-utils.import.scss @@ -1 +1,9 @@ -@forward './typography-legacy-index'; +@forward 'typography-utils' hide font-family, font-shorthand, font-size, font-weight, line-height, +letter-spacing, typography-level; +@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-get-type-value, +mat-typography-level; +@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family, +mat-typography-font-size, mat-typography-font-weight, mat-typography-get-type-value, +mat-typography-line-height, mat-typography-letter-spacing; +@forward 'typography-deprecated' as mat-typography-*; +@forward 'typography-utils-deprecated' as mat-typography-*; diff --git a/src/material/core/typography/_typography.import.scss b/src/material/core/typography/_typography.import.scss index 7cf5c79ac8eb..bb4481ab03e8 100644 --- a/src/material/core/typography/_typography.import.scss +++ b/src/material/core/typography/_typography.import.scss @@ -1,2 +1,14 @@ -@forward './typography-legacy-index'; +@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-line-height, mat-typography-level; +@forward 'typography-utils' as mat-line-* hide mat-line-font-family, mat-line-font-shorthand, +mat-line-font-size, mat-line-font-weight, mat-line-letter-spacing, mat-line-typography-level; +@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family, +mat-typography-font-size, mat-typography-font-weight, mat-typography-line-height, +mat-typography-letter-spacing; +@forward 'typography' as mat-* hide mat-define-typography-config, mat-define-typography-level; +@forward 'typography' as mat-typography-* hide mat-typography-typography-hierarchy, +mat-typography-private-typography-is-2014-config, mat-typography-private-typography-is-2018-config, +mat-typography-private-typography-to-2014-config, mat-typography-private-typography-to-2018-config; +@forward 'typography-deprecated' as mat-typography-* hide mat-typography-base-typography; +@forward 'typography-deprecated' as mat-* show mat-base-typography; + @import 'typography-utils'; diff --git a/src/material/datepicker/_datepicker-theme.import.scss b/src/material/datepicker/_datepicker-theme.import.scss index 25c33244fd45..4859e735daca 100644 --- a/src/material/datepicker/_datepicker-theme.import.scss +++ b/src/material/datepicker/_datepicker-theme.import.scss @@ -1,7 +1,15 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './datepicker-legacy-index'; +@forward 'datepicker-theme' hide $calendar-body-font-size, $calendar-weekday-table-font-size, +$range-fade-amount, $selected-fade-amount, $selected-today-box-shadow-width, $today-fade-amount, +color, date-range-colors, theme, typography; +@forward 'datepicker-theme' as mat-* hide $mat-range-fade-amount, $mat-selected-fade-amount, +$mat-selected-today-box-shadow-width, $mat-today-fade-amount, mat-color, mat-density, mat-theme, +mat-typography, mat-unselected-cell; +@forward 'datepicker-theme' as mat-datepicker-* hide $mat-datepicker-calendar-body-font-size, +$mat-datepicker-calendar-weekday-table-font-size, mat-datepicker-color, +mat-datepicker-date-range-colors, mat-datepicker-density, mat-datepicker-unselected-cell; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/dialog/_dialog-theme.import.scss b/src/material/dialog/_dialog-theme.import.scss index 0d4c33197d17..2b3782bcbcc2 100644 --- a/src/material/dialog/_dialog-theme.import.scss +++ b/src/material/dialog/_dialog-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './dialog-legacy-index'; +@forward 'dialog-theme' hide color, theme, typography; +@forward 'dialog-theme' as mat-dialog-* hide mat-dialog-density; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/divider/_divider-offset.import.scss b/src/material/divider/_divider-offset.import.scss index 0ec8fb8c816c..2d3dd7e337a4 100644 --- a/src/material/divider/_divider-offset.import.scss +++ b/src/material/divider/_divider-offset.import.scss @@ -1 +1 @@ -@forward './divider-legacy-index.scss'; +@forward 'divider-offset' as mat-*; diff --git a/src/material/divider/_divider-theme.import.scss b/src/material/divider/_divider-theme.import.scss index 65cbc80309a6..863c37206bc3 100644 --- a/src/material/divider/_divider-theme.import.scss +++ b/src/material/divider/_divider-theme.import.scss @@ -1,5 +1,6 @@ @forward '../core/theming/theming.import'; -@forward './divider-legacy-index'; +@forward 'divider-theme' hide color, theme, typography; +@forward 'divider-theme' as mat-divider-* hide mat-divider-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/expansion/_expansion-theme.import.scss b/src/material/expansion/_expansion-theme.import.scss index b1d2d5349d31..77b02cd64727 100644 --- a/src/material/expansion/_expansion-theme.import.scss +++ b/src/material/expansion/_expansion-theme.import.scss @@ -1,7 +1,9 @@ @forward '../core/theming/theming.import'; @forward '../core/style/private.import'; +@forward 'expansion-variables' as mat-expansion-panel-*; @forward '../core/typography/typography-utils.import'; -@forward './expansion-legacy-index'; +@forward 'expansion-mixins' as mat-*; +@forward 'expansion-theme' as mat-expansion-panel-*; @import '../core/density/private/compatibility'; @import '../core/theming/palette'; diff --git a/src/material/form-field/.form-field.md.swp b/src/material/form-field/.form-field.md.swp new file mode 100644 index 0000000000000000000000000000000000000000..9039143c4e5936f079ed01342107936832b7d1a8 GIT binary patch literal 16384 zcmeI3O>87b6~`+Hp9u+&AaSjDqu5J4<6QzM+IYQLHmu|XZvyL(pa|%i?ix>Ld%8#c z;aRhMMY$okao`XTD7WN@k_#6ELfklVNQA_VLoOVUIKuB$^>p{ljzc&hL|b~Yr>8#N z`@fHR?^Szr?rZx8`my18#m^^{x^cMst=B&P%{!h>?o?5gh9;FS-uuUo8@%xB^}%D0 zo;!Ey;GLQ{>^!)RZ=l zO|mo2^66k4+a&7zIh;nP?%IFRBhVwDs&YJd?B3@d{p@+?pl3E7)DPVMTn|i-K#xF= zK#xF=K#xF=K#xF=K##!x5d!7xF7X z@9U5KuO5LOfgXV#fgXV#fgXV#fgXV#fgXV#fgXV#f&T&mhKuu$v+t%9{M`R9>i<`H z_ylx6^hxN~_bD}oE<(G|U+(2IbRYD)k12HwRnRlgHRuuO5BDfFg6@QVemC==KYvuI zH=x&{YtXwNQR+v~7WAtREAYlsdN)pIRjFr*3GF0HBAZ{_c&aK&ZMx4k+)$aFn2}BP{7U|BwY$11drit|qSQ%N z>3N(aI<+>^Wu}Xn4dd~NHmSDLS$U$}67tO~=XHv-)aAtLpuIv9flzj>hIV%-$S|6)2rJX*1h zw%5So7+~utE@1Tpd`-dLDR7uX1!gw0CO2tlFK&40H-fV|9yjcV_sdY63o&VOb^r=X!Qtdj3TivqrP~eBRe)#Qf}+{ z#3G-)S!$;&TP&>8aUkQ}4oY~aH`Y;RJ*x7+#3{Ny@oQiUZoy!;K$Ni5$ac+?@v*() z(cBB#*~KKAyQ$f%6i9`Op;lsq%bN>p#&6)oZH+;uWwV7gS|@3E6?OcL=7skyir=q}C2z$0u?2hIQ-TgZlA2vAO??UDhG zyc|4&p}q=MGB&kyoa@-|))X&M>A3Wv*P^%;spxcLoo5iCl`Sb)SX%ji^W7b=9RIW zh*9Fz+Pb-t$eo$WI;x9AK`V6Q0RQG(|Y=VYK;h}b=jZ))^bRAc$e0XR3v1q3MpqSLY|gdnnZkpgivKWKxZ9L)xhc_7Z`Q$nv$cki4NX<}2(T)L7n>MTM~K2q zty%!59a{_TZ`)tTD5BxPn_vrRv;R;(Pvmv*>Kxro0W9*+0W%?`4kPXm5NTFd!aNRn zd{Dm?sGqcjpebQVi~Ebt#kq^x@K{5ga+s`Fetl-)UC%o0V0|Dd-ge#Ts0pcTf@(ve zo6W@*`5+GrfubS+bS%*sH?h;qWdL!0WXrjgD2XKNj9hk<@0{?YQdv%Vf!!qTsVKta zS(S3U$w}lLJJmd}xt#4oW_Vj7KKnrEqeweKUyW1N6GMZACMW1FvgBW$eJ|flbMXCIr*kJ{E4V6r9|tQsCZ`GC5IoEIm9$ z$u2x$CjQ*iMR_9OL3npOu7r1Y^q0Bu3U#WR81gx{`s&!Cnn^q?^yeBYm}5~GZbt|HtZTBxbqkT=pK|t*ZRE$Xo!2MdXY`BydY>=Rt zz2F;Lld_x@7j~L=eTVhCz{5D}z78yNik)Uf)hy;yga2S9KVfyLQ!|YB&EfiWy=|eS z)x_mtQiaDk@Fk=Z8qAvH=6!GNHt9$thB3~PB%6y*T=p+lw{cUBHvg8ji&~Kjqc|Mr z(>%*>aF`TvB+<;Pt4%%jf(sN(c6c;&hT^s*&8{Wb)*gawZOd?YR&B^cUu7&3s0{)? zN3;uyVrmU19pk?}2gY0GIYuc5|Gq>{9z>_?{ zujDYU^w5)-7&5g*VUBDuR4*P%itFm9H9Ep@k17C^a9nh4Sb*|rVKJ0i@2q!xYL*I5 zK_M{tAyjgoM{02*3SLk3f$=k3f$=k3f$= zkHG&T0=~yi2}g-4ZDCUGFsaD7efH<`=soFwyKJyiF!_8`TBIR8J(~QtC)tIx^EZ#J zielO<(k_+Eo>rig?ykY(TV`aD!GS6FrH^%xMO9*HBtAn9+DVutC#5QtD$&q@b=~rI zN99srvP##um9}c?+Ox3jY6Egt>E|~!4xj6u^fu+r4LZsdWxD59I-ru*N&!j+?6?Xj zaY=q{p0i9Ah82~A>j=wzg_A^jAb#RD-u+Gav$$8#hoUTJp`F>SlBIBoEbYQj z`Z?Q9M!GIl5@~5e2AxT61G*;83+M((yOsKLX+(oBZTc0hIyH$O3FC{pwKI9|-&<09 zxlzu!1k2KK65~A7&z*H>avd~w>pWwjw{(-9F&6`kF+JPj*}0|>{_tiHs6o{9>#di! z;lM4V59x-{H3qOu*ud7Lt3RMx54m5m(dZW8QWHvAo>kIz;-hOBlG4+85w; zhhOY{v5(isBKxdI?sjtL}Np4f1!nF&+cvpoqV1FX;1MnB9C_EytSS z@<)A3F)=KF-rk&HhcGUaYxJ*NzwUbJO%oltYtR^ZB3)*}L1GQ@>wIHqkMK9nU*N$1 E0)yxfUH||9 literal 0 HcmV?d00001 diff --git a/src/material/form-field/_form-field-fill-theme.import.scss b/src/material/form-field/_form-field-fill-theme.import.scss index 42d629397c0f..3d26f476e65f 100644 --- a/src/material/form-field/_form-field-fill-theme.import.scss +++ b/src/material/form-field/_form-field-fill-theme.import.scss @@ -1,6 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward './form-field-legacy-index'; +@forward 'form-field-fill-theme' hide $fill-dedupe, fill-color, fill-theme, fill-typography, +private-form-field-fill-density; +@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color, +mat-fill-label-floating, mat-fill-theme, mat-fill-typography; +@forward 'form-field-fill-theme' as mat-form-field-* hide mat-form-field-fill-label-floating, +mat-form-field-private-form-field-fill-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-legacy-theme.import.scss b/src/material/form-field/_form-field-legacy-theme.import.scss index 42d629397c0f..5ddf9b7bbfea 100644 --- a/src/material/form-field/_form-field-legacy-theme.import.scss +++ b/src/material/form-field/_form-field-legacy-theme.import.scss @@ -1,6 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward './form-field-legacy-index'; +@forward 'form-field-legacy-theme' hide $legacy-dedupe, legacy-color, legacy-theme, +legacy-typography, private-form-field-legacy-density; +@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color, +mat-legacy-label-floating, mat-legacy-label-floating-print, mat-legacy-theme, mat-legacy-typography; +@forward 'form-field-legacy-theme' as mat-form-field-* hide mat-form-field-legacy-label-floating, +mat-form-field-legacy-label-floating-print, mat-form-field-private-form-field-legacy-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-outline-theme.import.scss b/src/material/form-field/_form-field-outline-theme.import.scss index 42d629397c0f..f4ad9ac8d6c5 100644 --- a/src/material/form-field/_form-field-outline-theme.import.scss +++ b/src/material/form-field/_form-field-outline-theme.import.scss @@ -1,6 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward './form-field-legacy-index'; +@forward 'form-field-outline-theme' hide $outline-dedupe, outline-color, outline-theme, +outline-typography, private-form-field-outline-density; +@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color, +mat-outline-label-floating, mat-outline-theme, mat-outline-typography; +@forward 'form-field-outline-theme' as mat-form-field-* hide mat-form-field-outline-label-floating, +mat-form-field-private-form-field-outline-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-standard-theme.import.scss b/src/material/form-field/_form-field-standard-theme.import.scss index 42d629397c0f..e47749fe3563 100644 --- a/src/material/form-field/_form-field-standard-theme.import.scss +++ b/src/material/form-field/_form-field-standard-theme.import.scss @@ -1,6 +1,9 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward './form-field-legacy-index'; +@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme, +mat-standard-typography; +@forward 'form-field-standard-theme' as mat-form-field-* hide +mat-form-field-private-form-field-standard-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-theme.import.scss b/src/material/form-field/_form-field-theme.import.scss index 7d61bdc3d033..36523a2d3eb4 100644 --- a/src/material/form-field/_form-field-theme.import.scss +++ b/src/material/form-field/_form-field-theme.import.scss @@ -1,5 +1,23 @@ @forward '../core/style/form-common.import'; -@forward './form-field-legacy-index'; +@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color, mat-fill-theme, +mat-fill-typography; +@forward 'form-field-fill-theme' as mat-form-field-* hide +mat-form-field-private-form-field-fill-density; +@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color, +mat-legacy-theme, mat-legacy-typography; +@forward 'form-field-legacy-theme' as mat-form-field-* hide +mat-form-field-private-form-field-legacy-density; +@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color, +mat-outline-theme, mat-outline-typography; +@forward 'form-field-outline-theme' as mat-form-field-* hide +mat-form-field-private-form-field-outline-density; +@forward '../core/typography/typography-utils.import'; +@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme, +mat-standard-typography; +@forward 'form-field-standard-theme' as mat-form-field-* hide +mat-form-field-private-form-field-standard-density; +@forward 'form-field-theme' hide $dedupe, color, density, theme, typography; +@forward 'form-field-theme' as mat-form-field-* hide mat-form-field-label-floating; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/grid-list/_grid-list-theme.import.scss b/src/material/grid-list/_grid-list-theme.import.scss index 187d004fc02d..3dfcf1e4199f 100644 --- a/src/material/grid-list/_grid-list-theme.import.scss +++ b/src/material/grid-list/_grid-list-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; @forward '../core/style/list-common.import'; -@forward './grid-list-legacy-index'; +@forward 'grid-list-theme' hide color, theme, typography; +@forward 'grid-list-theme' as mat-grid-list-* hide mat-grid-list-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/icon/_icon-theme.import.scss b/src/material/icon/_icon-theme.import.scss index 7ea7f77da417..57b46365c6fd 100644 --- a/src/material/icon/_icon-theme.import.scss +++ b/src/material/icon/_icon-theme.import.scss @@ -1,4 +1,5 @@ @forward '../core/theming/theming.import'; -@forward './icon-legacy-index'; +@forward 'icon-theme' hide color, theme, typography; +@forward 'icon-theme' as mat-icon-* hide mat-icon-density; @import '../core/theming/theming'; diff --git a/src/material/input/_input-theme.import.scss b/src/material/input/_input-theme.import.scss index 8e5af94fcbfe..e2414e5da693 100644 --- a/src/material/input/_input-theme.import.scss +++ b/src/material/input/_input-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; @forward '../core/style/vendor-prefixes.import'; -@forward './input-legacy-index'; +@forward 'input-theme' hide color, theme, typography; +@forward 'input-theme' as mat-input-* hide mat-input-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/list/_list-theme.import.scss b/src/material/list/_list-theme.import.scss index ddc70f0e6f2d..7d9dba1a9e42 100644 --- a/src/material/list/_list-theme.import.scss +++ b/src/material/list/_list-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; @forward '../core/style/list-common.import'; -@forward './list-legacy-index'; +@forward 'list-theme' hide color, theme, typography; +@forward 'list-theme' as mat-list-* hide mat-list-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/menu/_menu-theme.import.scss b/src/material/menu/_menu-theme.import.scss index 208fe4cb0b9c..f1c9e9cdcb28 100644 --- a/src/material/menu/_menu-theme.import.scss +++ b/src/material/menu/_menu-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './menu-legacy-index'; +@forward 'menu-theme' hide color, theme, typography; +@forward 'menu-theme' as mat-menu-* hide mat-menu-density; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/paginator/_paginator-theme.import.scss b/src/material/paginator/_paginator-theme.import.scss index aa7bc009c40c..3bdfabf4fc91 100644 --- a/src/material/paginator/_paginator-theme.import.scss +++ b/src/material/paginator/_paginator-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/density/private/compatibility.import'; +@forward 'paginator-variables' as mat-paginator-*; @forward '../core/typography/typography-utils.import'; -@forward './paginator-legacy-index'; +@forward 'paginator-theme' as mat-paginator-*; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/progress-bar/_progress-bar-theme.import.scss b/src/material/progress-bar/_progress-bar-theme.import.scss index 6832724769fd..7fe2df21b04e 100644 --- a/src/material/progress-bar/_progress-bar-theme.import.scss +++ b/src/material/progress-bar/_progress-bar-theme.import.scss @@ -1,5 +1,6 @@ @forward '../core/theming/theming.import'; -@forward './progress-bar-legacy-index'; +@forward 'progress-bar-theme' hide color, theme, typography; +@forward 'progress-bar-theme' as mat-progress-bar-* hide mat-progress-bar-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/progress-spinner/_progress-spinner-theme.import.scss b/src/material/progress-spinner/_progress-spinner-theme.import.scss index 8ee9bd0367c8..647ca3b87e02 100644 --- a/src/material/progress-spinner/_progress-spinner-theme.import.scss +++ b/src/material/progress-spinner/_progress-spinner-theme.import.scss @@ -1,5 +1,6 @@ @forward '../core/theming/theming.import'; -@forward './progress-spinner-legacy-index'; +@forward 'progress-spinner-theme' hide color, theme, typography; +@forward 'progress-spinner-theme' as mat-progress-spinner-* hide mat-progress-spinner-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/radio/_radio-theme.import.scss b/src/material/radio/_radio-theme.import.scss index bf4a207ab110..4225856445dd 100644 --- a/src/material/radio/_radio-theme.import.scss +++ b/src/material/radio/_radio-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './radio-legacy-index'; +@forward 'radio-theme' hide color, theme, typography; +@forward 'radio-theme' as mat-radio-* hide mat-radio-color, mat-radio-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/select/_select-theme.import.scss b/src/material/select/_select-theme.import.scss index 0db88102fd85..2a042325d99b 100644 --- a/src/material/select/_select-theme.import.scss +++ b/src/material/select/_select-theme.import.scss @@ -1,7 +1,8 @@ @forward '../core/style/form-common.import'; @forward '../core/style/private.import'; @forward '../core/typography/typography-utils.import'; -@forward './select-legacy-index'; +@forward 'select-theme' hide color, theme, typography; +@forward 'select-theme' as mat-select-* hide mat-select-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/sidenav/_sidenav-theme.import.scss b/src/material/sidenav/_sidenav-theme.import.scss index 7b4a53674c5e..7280dbcf548a 100644 --- a/src/material/sidenav/_sidenav-theme.import.scss +++ b/src/material/sidenav/_sidenav-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; -@forward './sidenav-legacy-index'; +@forward 'sidenav-theme' hide color, theme, typography; +@forward 'sidenav-theme' as mat-sidenav-* hide mat-sidenav-density; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/slide-toggle/_slide-toggle-theme.import.scss b/src/material/slide-toggle/_slide-toggle-theme.import.scss index 5b22071081c1..bfda867ea93d 100644 --- a/src/material/slide-toggle/_slide-toggle-theme.import.scss +++ b/src/material/slide-toggle/_slide-toggle-theme.import.scss @@ -1,7 +1,9 @@ @forward '../core/style/private.import'; @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './slide-toggle-legacy-index'; +@forward 'slide-toggle-theme' hide color, theme, typography; +@forward 'slide-toggle-theme' as mat-slide-toggle-* hide mat-slide-toggle-checked, +mat-slide-toggle-density; @import '../core/style/private'; @import '../core/theming/palette'; diff --git a/src/material/slider/_slider-theme.import.scss b/src/material/slider/_slider-theme.import.scss index 054b2a82e2d3..33b2b790d0cb 100644 --- a/src/material/slider/_slider-theme.import.scss +++ b/src/material/slider/_slider-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './slider-legacy-index'; +@forward 'slider-theme' hide color, theme, typography; +@forward 'slider-theme' as mat-slider-* hide mat-slider-density, mat-slider-inner-content-theme; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/snack-bar/_snack-bar-theme.import.scss b/src/material/snack-bar/_snack-bar-theme.import.scss index ef6f2006b741..cb499e497743 100644 --- a/src/material/snack-bar/_snack-bar-theme.import.scss +++ b/src/material/snack-bar/_snack-bar-theme.import.scss @@ -2,7 +2,8 @@ @forward '../core/theming/theming.import'; @forward '../core/style/private.import'; @forward '../core/typography/typography-utils.import'; -@forward './snack-bar-legacy-index'; +@forward 'snack-bar-theme' hide color, theme, typography; +@forward 'snack-bar-theme' as mat-snack-bar-* hide mat-snack-bar-density; @import '../core/typography/typography-utils'; @import '../core/theming/theming'; diff --git a/src/material/sort/_sort-theme.import.scss b/src/material/sort/_sort-theme.import.scss index 7207b667e986..36b714f6be06 100644 --- a/src/material/sort/_sort-theme.import.scss +++ b/src/material/sort/_sort-theme.import.scss @@ -1,4 +1,5 @@ @forward '../core/theming/theming.import'; -@forward './sort-legacy-index'; +@forward 'sort-theme' hide color, theme, typography; +@forward 'sort-theme' as mat-sort-* hide mat-sort-density; @import '../core/theming/theming'; diff --git a/src/material/stepper/_stepper-theme.import.scss b/src/material/stepper/_stepper-theme.import.scss index 4b6000a6d7fb..95dcc2b634f3 100644 --- a/src/material/stepper/_stepper-theme.import.scss +++ b/src/material/stepper/_stepper-theme.import.scss @@ -1,7 +1,13 @@ @forward '../core/theming/theming.import'; @forward '../core/density/private/compatibility.import'; +@forward 'stepper-variables' as mat-* hide $mat-density-config, $mat-header-height, +$mat-header-maximum-height, $mat-header-minimum-height, $mat-label-header-height, +$mat-label-min-width, $mat-label-position-bottom-top-gap, $mat-line-gap, $mat-line-width, +$mat-side-gap; +@forward 'stepper-variables' as mat-stepper-* hide $mat-stepper-step-header-icon-size, +$mat-stepper-step-sub-label-font-size, $mat-stepper-vertical-stepper-content-margin; @forward '../core/typography/typography-utils.import'; -@forward './stepper-legacy-index'; +@forward 'stepper-theme' as mat-stepper-*; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/table/_table-flex-styles.import.scss b/src/material/table/_table-flex-styles.import.scss index 9000ce48b89f..ce779389f77e 100644 --- a/src/material/table/_table-flex-styles.import.scss +++ b/src/material/table/_table-flex-styles.import.scss @@ -1 +1 @@ -@forward './table-legacy-index'; +@forward 'table-flex-styles' as mat-*; diff --git a/src/material/table/_table-theme.import.scss b/src/material/table/_table-theme.import.scss index 8219d4c8f42f..8a64a0ef6a7d 100644 --- a/src/material/table/_table-theme.import.scss +++ b/src/material/table/_table-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './table-legacy-index'; +@forward 'table-theme' hide color, theme, typography; +@forward 'table-theme' as mat-table-* hide mat-table-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/tabs/_tabs-common.import.scss b/src/material/tabs/_tabs-common.import.scss index 954fbfa5ba5d..71662e338162 100644 --- a/src/material/tabs/_tabs-common.import.scss +++ b/src/material/tabs/_tabs-common.import.scss @@ -1,7 +1,9 @@ @forward '../core/style/private.import'; @forward '../core/style/vendor-prefixes.import'; @forward '../../cdk/a11y/index.import'; -@forward './tabs-legacy-index'; +@forward 'tabs-common' hide $tab-animation-duration, $tab-bar-height; +@forward 'tabs-common' as mat-* hide mat-ink-bar, mat-paginated-tab-header, +mat-paginated-tab-header-container, mat-paginated-tab-header-item-wrapper, mat-tab-label; @import '../core/style/variables'; @import '../core/style/private'; diff --git a/src/material/tabs/_tabs-theme.import.scss b/src/material/tabs/_tabs-theme.import.scss index 52dd9468d601..56058307fa2c 100644 --- a/src/material/tabs/_tabs-theme.import.scss +++ b/src/material/tabs/_tabs-theme.import.scss @@ -1,6 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './tabs-legacy-index'; +@forward 'tabs-theme' hide color, theme, typography; +@forward 'tabs-theme' as mat-tabs-* hide mat-tabs-background, mat-tabs-density, mat-tabs-ink-bar, +mat-tabs-tab-label-focus; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/toolbar/_toolbar-theme.import.scss b/src/material/toolbar/_toolbar-theme.import.scss index b682fb9532cd..e0c0dbf55779 100644 --- a/src/material/toolbar/_toolbar-theme.import.scss +++ b/src/material/toolbar/_toolbar-theme.import.scss @@ -1,7 +1,10 @@ @forward '../core/theming/theming.import'; @forward '../core/style/variables.import'; +@forward 'toolbar-variables' as mat-toolbar-*; @forward '../core/typography/typography-utils.import'; -@forward './toolbar-legacy-index'; +@forward 'toolbar-theme' hide color, density, theme, typography; +@forward 'toolbar-theme' as mat-toolbar-* hide mat-toolbar-color, mat-toolbar-form-field-overrides, +mat-toolbar-height; @import '../core/density/private/compatibility'; @import '../core/style/variables'; diff --git a/src/material/toolbar/_toolbar-variables.import.scss b/src/material/toolbar/_toolbar-variables.import.scss index 9faf8d47773b..e9053691d0d1 100644 --- a/src/material/toolbar/_toolbar-variables.import.scss +++ b/src/material/toolbar/_toolbar-variables.import.scss @@ -1 +1 @@ -@forward './toolbar-legacy-index'; +@forward 'toolbar-variables' as mat-toolbar-*; diff --git a/src/material/tooltip/_tooltip-theme.import.scss b/src/material/tooltip/_tooltip-theme.import.scss index 4bfeab03767f..4a0efa17862d 100644 --- a/src/material/tooltip/_tooltip-theme.import.scss +++ b/src/material/tooltip/_tooltip-theme.import.scss @@ -1,6 +1,8 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward './tooltip-legacy-index'; +@forward 'tooltip-theme' hide $font-size, $handset-font-size, $handset-target-height, +$handset-vertical-padding, $target-height, $vertical-padding, color, theme, typography; +@forward 'tooltip-theme' as mat-tooltip-* hide mat-tooltip-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/tree/_tree-theme.import.scss b/src/material/tree/_tree-theme.import.scss index ed42dcb4c785..c7ed1fdf06dd 100644 --- a/src/material/tree/_tree-theme.import.scss +++ b/src/material/tree/_tree-theme.import.scss @@ -1,6 +1,7 @@ @forward '../core/theming/theming.import'; +@forward 'tree-variables' as mat-tree-*; @forward '../core/typography/typography-utils.import'; -@forward './tree-legacy-index'; +@forward 'tree-theme' as mat-tree-*; @import '../core/density/private/compatibility'; @import '../core/theming/palette'; diff --git a/src/material/tree/_tree-variables.import.scss b/src/material/tree/_tree-variables.import.scss index 465eb38e9be6..8cd583945dce 100644 --- a/src/material/tree/_tree-variables.import.scss +++ b/src/material/tree/_tree-variables.import.scss @@ -1 +1 @@ -@forward './tree-legacy-index'; +@forward 'tree-variables' as mat-tree-*;