diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 492a0c6a8224..9ffb6133f445 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -103,12 +103,9 @@ /src/material-experimental/mdc-card/** @mmalerba /src/material-experimental/mdc-checkbox/** @mmalerba /src/material-experimental/mdc-chips/** @mmalerba -/src/material-experimental/mdc-color/** @andrewseguin @devversion /src/material-experimental/mdc-core/** @crisbeto -/src/material-experimental/mdc-density/** @devversion /src/material-experimental/mdc-dialog/** @devversion /src/material-experimental/mdc-form-field/** @devversion @mmalerba -/src/material-experimental/mdc-helpers/** @mmalerba /src/material-experimental/mdc-input/** @devversion @mmalerba /src/material-experimental/mdc-list/** @mmalerba @devversion /src/material-experimental/mdc-menu/** @crisbeto @@ -123,8 +120,6 @@ /src/material-experimental/mdc-tabs/** @crisbeto /src/material-experimental/mdc-tooltip/** @crisbeto /src/material-experimental/mdc-table/** @andrewseguin -/src/material-experimental/mdc-theming/** @mmalerba -/src/material-experimental/mdc-typography/** @mmalerba /src/material-experimental/menubar/** @jelbourn /src/material-experimental/popover-edit/** @andrewseguin /src/material-experimental/selection/** @andrewseguin diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts index 81b9a7d76151..c74b7cdef1ac 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mts @@ -45,12 +45,9 @@ export const commitMessage: CommitMessageConfig = { 'material-experimental/mdc-card', 'material-experimental/mdc-checkbox', 'material-experimental/mdc-chips', - 'material-experimental/mdc-color', 'material-experimental/mdc-core', - 'material-experimental/mdc-density', 'material-experimental/mdc-dialog', 'material-experimental/mdc-form-field', - 'material-experimental/mdc-helpers', 'material-experimental/mdc-input', 'material-experimental/mdc-list', 'material-experimental/mdc-menu', @@ -65,8 +62,6 @@ export const commitMessage: CommitMessageConfig = { 'material-experimental/mdc-table', 'material-experimental/mdc-tabs', 'material-experimental/mdc-tooltip', - 'material-experimental/mdc-theming', - 'material-experimental/mdc-typography', 'material-experimental/menubar', 'material-experimental/popover-edit', 'material-experimental/selection', diff --git a/scripts/migrate-sass-modules.js b/scripts/migrate-sass-modules.js index 3fc562a4fc5f..dded45baa53b 100644 --- a/scripts/migrate-sass-modules.js +++ b/scripts/migrate-sass-modules.js @@ -66,7 +66,7 @@ migrate('material/core/**/_*.scss', materialPrefixes, true); commentOutMdc('material-experimental/**/*.scss'); // Migrate all of the MDC partials. -migrate('material-experimental/mdc-helpers/**/_*.scss', mdcPrefixes, true); +migrate('material-experimental/mdc-core/mdc-helpers/**/_*.scss', mdcPrefixes, true); migrate('material-experimental/mdc-core/**/_*.scss', mdcPrefixes, true, ['**/_core.scss']); migrate('material-experimental/**/_*.scss', mdcPrefixes, true); diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel index 7d8aa3e0a47c..7c50bc95af98 100644 --- a/src/material-experimental/BUILD.bazel +++ b/src/material-experimental/BUILD.bazel @@ -20,11 +20,11 @@ ts_library( sass_library( name = "theming_scss_lib", srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [ - "//src/material-experimental/mdc-color", - "//src/material-experimental/mdc-density", - "//src/material-experimental/mdc-helpers", - "//src/material-experimental/mdc-theming", - "//src/material-experimental/mdc-typography", + "//src/material-experimental/mdc-core/color", + "//src/material-experimental/mdc-core/density", + "//src/material-experimental/mdc-core/mdc-helpers", + "//src/material-experimental/mdc-core/theming", + "//src/material-experimental/mdc-core/typography", ], ) diff --git a/src/material-experimental/_index.scss b/src/material-experimental/_index.scss index 3173197bc34b..cb50f5ecf009 100644 --- a/src/material-experimental/_index.scss +++ b/src/material-experimental/_index.scss @@ -1,13 +1,13 @@ // Structural -@forward './mdc-helpers/focus-indicators' as mdc-* show mdc-strong-focus-indicators; +@forward './mdc-core/mdc-helpers/focus-indicators' as mdc-* show mdc-strong-focus-indicators; @forward './mdc-core/elevation' as mdc-* show mdc-elevation, mdc-overridable-elevation; // Theme bundles -@forward './mdc-theming/all-theme' show all-mdc-component-themes; -@forward './mdc-color/all-color' show all-mdc-component-colors; -@forward './mdc-typography/all-typography' show all-mdc-component-typographies, +@forward './mdc-core/theming/all-theme' show all-mdc-component-themes; +@forward './mdc-core/color/all-color' show all-mdc-component-colors; +@forward './mdc-core/typography/all-typography' show all-mdc-component-typographies, define-mdc-typography-config; -@forward './mdc-density/all-density' show all-mdc-component-densities; +@forward './mdc-core/density/all-density' show all-mdc-component-densities; // Component themes @forward './column-resize/column-resize-theme' as column-resize-* show column-resize-color, @@ -18,7 +18,7 @@ // MDC-related themes @forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color, mdc-core-density, mdc-core-typography; -@forward './mdc-helpers/focus-indicators-theme' as mdc-strong-focus-indicators-* show +@forward './mdc-core/mdc-helpers/focus-indicators-theme' as mdc-strong-focus-indicators-* show mdc-strong-focus-indicators-color, mdc-strong-focus-indicators-theme; @forward './mdc-core/option/option-theme' as mdc-option-* show mdc-option-color, mdc-option-typography, mdc-option-density, mdc-option-theme; diff --git a/src/material-experimental/mdc-autocomplete/BUILD.bazel b/src/material-experimental/mdc-autocomplete/BUILD.bazel index ee6b011e34dd..8ebcad911d7d 100644 --- a/src/material-experimental/mdc-autocomplete/BUILD.bazel +++ b/src/material-experimental/mdc-autocomplete/BUILD.bazel @@ -27,8 +27,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -40,8 +40,8 @@ sass_binary( ], deps = [ "//src/cdk:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.import.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.import.scss index ab1d1c528e40..fb310498ef6a 100644 --- a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.import.scss +++ b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'autocomplete-theme' as mat-mdc-autocomplete-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss index 2d640f0c545d..4f0ffe9bb6b0 100644 --- a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss +++ b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss @@ -2,7 +2,7 @@ @use '@material/menu-surface/mixins' as mdc-menu-surface; @use '@material/list/evolution-mixins' as mdc-list; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index ad6a7e477778..0611dd8799f3 100644 --- a/src/material-experimental/mdc-button/BUILD.bazel +++ b/src/material-experimental/mdc-button/BUILD.bazel @@ -36,8 +36,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -55,8 +55,8 @@ sass_binary( deps = [ ":button_base_scss_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -78,8 +78,8 @@ sass_binary( deps = [ ":button_base_scss_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -92,8 +92,8 @@ sass_binary( deps = [ ":button_base_scss_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-button/_button-base.scss b/src/material-experimental/mdc-button/_button-base.scss index 861c2308f365..3d1d8f20166b 100644 --- a/src/material-experimental/mdc-button/_button-base.scss +++ b/src/material-experimental/mdc-button/_button-base.scss @@ -2,7 +2,7 @@ @use '@angular/material' as mat; @use '@material/touch-target' as mdc-touch-target; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Adds styles necessary to provide stateful interactions with the button. This includes providing // content for the state container's ::before and ::after so that they can be given a background diff --git a/src/material-experimental/mdc-button/_button-theme.import.scss b/src/material-experimental/mdc-button/_button-theme.import.scss index b2cbeb5577b4..1a1c6328c77d 100644 --- a/src/material-experimental/mdc-button/_button-theme.import.scss +++ b/src/material-experimental/mdc-button/_button-theme.import.scss @@ -1,6 +1,6 @@ -@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; @forward '../../material/core/ripple/ripple.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'button-theme' hide color, density, theme, typography; @forward 'button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, mat-mdc-color, mat-mdc-density, mat-mdc-mat-button-apply-disabled-style, mat-mdc-mat-button-disabled-background, @@ -13,4 +13,4 @@ mat-mdc-button-mat-button-disabled-color, mat-mdc-button-mat-button-ripple-ink-c @forward 'icon-button-theme' as mat-mdc-icon-button-*; @import '../../material/core/ripple/ripple'; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-button/_button-theme.scss b/src/material-experimental/mdc-button/_button-theme.scss index 41ad44eaea6c..d433ceaf7160 100644 --- a/src/material-experimental/mdc-button/_button-theme.scss +++ b/src/material-experimental/mdc-button/_button-theme.scss @@ -8,7 +8,7 @@ @use '@material/button/button-outlined-theme' as mdc-button-outlined-theme; @use '@material/theme/theme-color' as mdc-theme-color; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-theme-private'; @mixin _button-variant($color) { diff --git a/src/material-experimental/mdc-button/_fab-theme.scss b/src/material-experimental/mdc-button/_fab-theme.scss index a420b88e818c..2fb997c0cad7 100644 --- a/src/material-experimental/mdc-button/_fab-theme.scss +++ b/src/material-experimental/mdc-button/_fab-theme.scss @@ -4,7 +4,7 @@ @use '@material/fab/fab-theme' as mdc-fab-theme; @use '@material/theme/theme-color' as mdc-theme-color; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-theme-private'; @mixin _fab-variant($foreground, $background) { diff --git a/src/material-experimental/mdc-button/_icon-button-theme.scss b/src/material-experimental/mdc-button/_icon-button-theme.scss index 4c45e1e43624..ec711d6fbcba 100644 --- a/src/material-experimental/mdc-button/_icon-button-theme.scss +++ b/src/material-experimental/mdc-button/_icon-button-theme.scss @@ -4,7 +4,7 @@ @use '@material/icon-button/icon-button-theme' as mdc-icon-button-theme; @use '@material/theme/theme-color' as mdc-theme-color; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-theme-private'; @mixin color($config-or-theme) { diff --git a/src/material-experimental/mdc-button/button.scss b/src/material-experimental/mdc-button/button.scss index 5b7e705583fc..0bbb052cdcbb 100644 --- a/src/material-experimental/mdc-button/button.scss +++ b/src/material-experimental/mdc-button/button.scss @@ -8,7 +8,7 @@ @use '@material/button/button-protected-theme' as mdc-button-protected-theme; @use '@material/button/button-outlined-theme' as mdc-button-outlined-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-base'; @include mdc-helpers.disable-fallback-declarations { diff --git a/src/material-experimental/mdc-button/fab.scss b/src/material-experimental/mdc-button/fab.scss index dd6f79b7fc8e..ef3fc064b979 100644 --- a/src/material-experimental/mdc-button/fab.scss +++ b/src/material-experimental/mdc-button/fab.scss @@ -2,7 +2,7 @@ @use '@material/fab' as mdc-fab; @use '@material/elevation/elevation-theme' as mdc-elevation-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-base'; @include mdc-helpers.disable-fallback-declarations { diff --git a/src/material-experimental/mdc-button/icon-button.scss b/src/material-experimental/mdc-button/icon-button.scss index 3448b4b69f6c..bbeac9c94708 100644 --- a/src/material-experimental/mdc-button/icon-button.scss +++ b/src/material-experimental/mdc-button/icon-button.scss @@ -3,7 +3,7 @@ @use '@material/icon-button/icon-button' as mdc-icon-button; @use '@material/icon-button/icon-button-theme' as mdc-icon-button-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './button-base'; @include mdc-helpers.disable-fallback-declarations { diff --git a/src/material-experimental/mdc-card/BUILD.bazel b/src/material-experimental/mdc-card/BUILD.bazel index 42cf75492258..2a2243cc5035 100644 --- a/src/material-experimental/mdc-card/BUILD.bazel +++ b/src/material-experimental/mdc-card/BUILD.bazel @@ -28,8 +28,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -40,8 +40,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-card/_card-theme.import.scss b/src/material-experimental/mdc-card/_card-theme.import.scss index d7c3c008e9b5..457470bb8eb4 100644 --- a/src/material-experimental/mdc-card/_card-theme.import.scss +++ b/src/material-experimental/mdc-card/_card-theme.import.scss @@ -1,7 +1,7 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'card-theme' hide color, density, theme, typography; @forward 'card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-card/_card-theme.scss b/src/material-experimental/mdc-card/_card-theme.scss index b5ad228a295e..bf0c6f9ca5ae 100644 --- a/src/material-experimental/mdc-card/_card-theme.scss +++ b/src/material-experimental/mdc-card/_card-theme.scss @@ -5,7 +5,7 @@ @use 'sass:color'; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-card/card.scss b/src/material-experimental/mdc-card/card.scss index c48cbfbee1f6..ecee4e26e24f 100644 --- a/src/material-experimental/mdc-card/card.scss +++ b/src/material-experimental/mdc-card/card.scss @@ -1,6 +1,6 @@ @use 'sass:math'; @use '@material/card' as mdc-card; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // TODO(jelbourn): move header and title-group styles to their own files. diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 4f250ecce22b..9ad57701d63c 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -36,8 +36,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -51,8 +51,8 @@ sass_binary( ":mdc_checkbox_scss_lib", "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-checkbox/_checkbox-theme.import.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.import.scss index 0eae93c210dd..796343c81021 100644 --- a/src/material-experimental/mdc-checkbox/_checkbox-theme.import.scss +++ b/src/material-experimental/mdc-checkbox/_checkbox-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'checkbox-theme' hide color, density, private-checkbox-styles-with-color, theme, typography; @forward 'checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, @@ -12,4 +12,4 @@ mat-mdc-checkbox-background-focus-indicator-checked-color, mat-mdc-checkbox-background-focus-indicator-color, mat-mdc-checkbox-private-checkbox-styles-with-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss index 5f0da4fe9f9b..98aadda1a3a5 100644 --- a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss +++ b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss @@ -7,7 +7,7 @@ @use 'sass:map'; @use 'sass:color'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './checkbox-private'; // Apply ripple colors to the MatRipple element and the MDC ripple element when the diff --git a/src/material-experimental/mdc-checkbox/checkbox.scss b/src/material-experimental/mdc-checkbox/checkbox.scss index a2bbcee30802..582183397db7 100644 --- a/src/material-experimental/mdc-checkbox/checkbox.scss +++ b/src/material-experimental/mdc-checkbox/checkbox.scss @@ -7,7 +7,7 @@ @use '@material/touch-target' as mdc-touch-target; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './checkbox-private'; @include mdc-helpers.disable-fallback-declarations { diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index 239641aede5c..b6f3035d71bd 100644 --- a/src/material-experimental/mdc-chips/BUILD.bazel +++ b/src/material-experimental/mdc-chips/BUILD.bazel @@ -37,8 +37,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -51,8 +51,8 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -63,8 +63,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", "//src/material/core:core_scss_lib", ], ) diff --git a/src/material-experimental/mdc-chips/_chips-theme.import.scss b/src/material-experimental/mdc-chips/_chips-theme.import.scss index f9b85caa6a14..9874c3b6ae8f 100644 --- a/src/material-experimental/mdc-chips/_chips-theme.import.scss +++ b/src/material-experimental/mdc-chips/_chips-theme.import.scss @@ -1,8 +1,8 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'chips-theme' hide color, density, theme, typography; @forward 'chips-theme' as mat-mdc-chips-* hide $mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, $mat-mdc-chips-mdc-chips-ink-color-default, mat-mdc-chips-selected-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-chips/_chips-theme.scss b/src/material-experimental/mdc-chips/_chips-theme.scss index 76756fa995ce..023280bac570 100644 --- a/src/material-experimental/mdc-chips/_chips-theme.scss +++ b/src/material-experimental/mdc-chips/_chips-theme.scss @@ -7,7 +7,7 @@ @use 'sass:color'; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Customizes the appearance of a chip. Note that ideally we would be doing this using the // `theme-styles` mixin, however it has the following problems: diff --git a/src/material-experimental/mdc-chips/chip-set.scss b/src/material-experimental/mdc-chips/chip-set.scss index 4c4fc242066b..c9c94f24fd2d 100644 --- a/src/material-experimental/mdc-chips/chip-set.scss +++ b/src/material-experimental/mdc-chips/chip-set.scss @@ -1,5 +1,5 @@ @use '@material/chips/chip-set' as mdc-chip-set; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-chip-set.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-chips/chip.scss b/src/material-experimental/mdc-chips/chip.scss index bd27a0bf205b..bbf2b37e7d8f 100644 --- a/src/material-experimental/mdc-chips/chip.scss +++ b/src/material-experimental/mdc-chips/chip.scss @@ -3,7 +3,7 @@ @use '@material/chips/chip' as mdc-chip; @use '@material/chips/chip-theme' as mdc-chip-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-chip.without-ripple-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-color/_all-color.import.scss b/src/material-experimental/mdc-color/_all-color.import.scss deleted file mode 100644 index 01ce168e9f1a..000000000000 --- a/src/material-experimental/mdc-color/_all-color.import.scss +++ /dev/null @@ -1,94 +0,0 @@ -@forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; -@forward '../../material/core/core.import'; -@forward '../mdc-button/button-theme' hide color, density, theme, typography; -@forward '../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, -mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; -@forward '../mdc-button/button-theme' as mat-mdc-button-* hide -$mat-mdc-button-mat-button-state-target; -@forward '../mdc-button/fab-theme' as mat-mdc-fab-*; -@forward '../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; -@forward '../mdc-card/card-theme' hide color, density, theme, typography; -@forward '../mdc-card/card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, -$mat-mdc-card-mdc-card-outline-color; -@forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, -theme, typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, -$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, -mat-mdc-typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide -$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, -mat-mdc-checkbox-private-checkbox-styles-with-color; -@forward '../mdc-chips/chips-theme' hide color, density, theme, typography; -@forward '../mdc-chips/chips-theme' as mat-mdc-chips-* hide -$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, -$mat-mdc-chips-mdc-chips-ink-color-default; -@forward '../mdc-radio/radio-theme' hide color, density, theme, typography; -@forward '../mdc-radio/radio-theme' as mat-mdc-radio-* hide -$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, -$mat-mdc-radio-mdc-radio-unchecked-color; -@forward '../mdc-select/select-theme' hide color, density, theme, typography; -@forward '../mdc-select/select-theme' as mat-mdc-select-* hide -$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, -$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, -$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; -@forward '../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; -@forward '../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide -$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; -@forward '../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; -@forward '../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide -$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, -$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; -@forward '../mdc-tabs/tabs-theme' hide color, density, theme, typography; -@forward '../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, -$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; -@forward '../mdc-table/table-theme' hide color, density, theme, typography; -@forward '../mdc-table/table-theme' as mat-mdc-table-* hide -$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, -$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, -$mat-mdc-table-mdc-data-table-selected-row-fill-color, -$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, -$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; -@forward '../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; -@forward '../mdc-form-field/form-field-sizing'; -@forward '../mdc-form-field/form-field-native-select' hide private-form-field-native-select, -private-form-field-native-select-color; -@forward '../mdc-form-field/form-field-native-select' as mat-mdc-* hide -$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, -$mat-mdc-mat-form-field-select-horizontal-end-padding; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' hide -private-text-field-refresh-theme-variables; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide -$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, -$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, -$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, -$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, -$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, -$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, -$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, -$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; -@forward '../mdc-core/core-theme.import'; -@forward '../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; -@forward '../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; -@forward '../mdc-list/interactive-list-theme' as mat-mdc-*; -@forward '../mdc-list/list-option-theme' as mat-mdc-*; -@forward '../mdc-list/list-theme' as mat-mdc-list-*; -@forward '../mdc-menu/menu-theme' as mat-mdc-menu-*; -@forward '../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; -@forward '../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; -@forward '../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; -@forward '../mdc-input/input-theme' as mat-mdc-input-*; -@forward '../mdc-form-field/form-field-density' as mat-mdc-*; -@forward '../mdc-form-field/form-field-subscript' as mat-mdc-*; -@forward '../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; -@forward '../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; -@forward '../mdc-theming/all-theme'; -@forward 'all-color' hide all-mdc-component-colors; - -@import '../mdc-theming/all-theme'; diff --git a/src/material-experimental/mdc-core/BUILD.bazel b/src/material-experimental/mdc-core/BUILD.bazel index 24cd7a9cd74d..88f046ae14fd 100644 --- a/src/material-experimental/mdc-core/BUILD.bazel +++ b/src/material-experimental/mdc-core/BUILD.bazel @@ -32,7 +32,7 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", ], ) @@ -45,8 +45,8 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -57,8 +57,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-core/_core-theme.import.scss b/src/material-experimental/mdc-core/_core-theme.import.scss index 52423dfdb9c0..d3f935b2e28e 100644 --- a/src/material-experimental/mdc-core/_core-theme.import.scss +++ b/src/material-experimental/mdc-core/_core-theme.import.scss @@ -1,6 +1,6 @@ @forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward './mdc-helpers/mdc-helpers.import'; +@forward './mdc-helpers/mdc-helpers'; @forward 'option/option-theme' as mat-mdc-*; @forward 'option/optgroup-theme' as mat-mdc-optgroup-*; @forward 'core-theme' as mat-mdc-core-*; diff --git a/src/material-experimental/mdc-color/BUILD.bazel b/src/material-experimental/mdc-core/color/BUILD.bazel similarity index 75% rename from src/material-experimental/mdc-color/BUILD.bazel rename to src/material-experimental/mdc-core/color/BUILD.bazel index 2ef78deea15d..ed94e2d28ee0 100644 --- a/src/material-experimental/mdc-color/BUILD.bazel +++ b/src/material-experimental/mdc-core/color/BUILD.bazel @@ -3,7 +3,7 @@ load("//tools:defaults.bzl", "sass_library") package(default_visibility = ["//visibility:public"]) filegroup( - name = "mdc-color", + name = "color", srcs = [":all_color"], ) @@ -12,6 +12,6 @@ sass_library( srcs = ["_all-color.scss"], deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-theming:all_themes", + "//src/material-experimental/mdc-core/theming:all_themes", ], ) diff --git a/src/material-experimental/mdc-core/color/_all-color.import.scss b/src/material-experimental/mdc-core/color/_all-color.import.scss new file mode 100644 index 000000000000..324346b2cedf --- /dev/null +++ b/src/material-experimental/mdc-core/color/_all-color.import.scss @@ -0,0 +1,94 @@ +@forward '../../../material/core/theming/theming.import'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; +@forward '../../../material/core/core.import'; +@forward '../../mdc-button/button-theme' hide color, density, theme, typography; +@forward '../../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, +mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; +@forward '../../mdc-button/button-theme' as mat-mdc-button-* hide +$mat-mdc-button-mat-button-state-target; +@forward '../../mdc-button/fab-theme' as mat-mdc-fab-*; +@forward '../../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; +@forward '../../mdc-card/card-theme' hide color, density, theme, typography; +@forward '../../mdc-card/card-theme' as mat-mdc-card-* hide +$mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color; +@forward '../../mdc-checkbox/checkbox-theme' hide color, density, +private-checkbox-styles-with-color, theme, typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, +$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, +mat-mdc-typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide +$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, +mat-mdc-checkbox-private-checkbox-styles-with-color; +@forward '../../mdc-chips/chips-theme' hide color, density, theme, typography; +@forward '../../mdc-chips/chips-theme' as mat-mdc-chips-* hide +$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, +$mat-mdc-chips-mdc-chips-ink-color-default; +@forward '../../mdc-radio/radio-theme' hide color, density, theme, typography; +@forward '../../mdc-radio/radio-theme' as mat-mdc-radio-* hide +$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, +$mat-mdc-radio-mdc-radio-unchecked-color; +@forward '../../mdc-select/select-theme' hide color, density, theme, typography; +@forward '../../mdc-select/select-theme' as mat-mdc-select-* hide +$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, +$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, +$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; +@forward '../../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; +@forward '../../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide +$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; +@forward '../../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; +@forward '../../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide +$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, +$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; +@forward '../../mdc-tabs/tabs-theme' hide color, density, theme, typography; +@forward '../../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, +$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; +@forward '../../mdc-table/table-theme' hide color, density, theme, typography; +@forward '../../mdc-table/table-theme' as mat-mdc-table-* hide +$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, +$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, +$mat-mdc-table-mdc-data-table-selected-row-fill-color, +$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, +$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; +@forward '../../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; +@forward '../../mdc-form-field/form-field-sizing'; +@forward '../../mdc-form-field/form-field-native-select' hide private-form-field-native-select, +private-form-field-native-select-color; +@forward '../../mdc-form-field/form-field-native-select' as mat-mdc-* hide +$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, +$mat-mdc-mat-form-field-select-horizontal-end-padding; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' hide +private-text-field-refresh-theme-variables; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide +$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, +$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, +$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, +$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, +$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, +$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, +$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, +$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; +@forward '../core-theme.import'; +@forward '../../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; +@forward '../../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; +@forward '../../mdc-list/interactive-list-theme' as mat-mdc-*; +@forward '../../mdc-list/list-option-theme' as mat-mdc-*; +@forward '../../mdc-list/list-theme' as mat-mdc-list-*; +@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; +@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; +@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; +@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; +@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; +@forward '../../mdc-input/input-theme' as mat-mdc-input-*; +@forward '../../mdc-form-field/form-field-density' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-subscript' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; +@forward '../theming/all-theme'; +@forward 'all-color' hide all-mdc-component-colors; + +@import '../theming/all-theme'; diff --git a/src/material-experimental/mdc-color/_all-color.scss b/src/material-experimental/mdc-core/color/_all-color.scss similarity index 95% rename from src/material-experimental/mdc-color/_all-color.scss rename to src/material-experimental/mdc-core/color/_all-color.scss index 7a0cfcbccd2d..ea8c3a4f853e 100644 --- a/src/material-experimental/mdc-color/_all-color.scss +++ b/src/material-experimental/mdc-core/color/_all-color.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; -@use '../mdc-theming/all-theme'; +@use '../theming/all-theme'; @mixin all-mdc-component-colors($config-or-theme) { // In case a theme object has been passed instead of a configuration for diff --git a/src/material-experimental/mdc-density/BUILD.bazel b/src/material-experimental/mdc-core/density/BUILD.bazel similarity index 75% rename from src/material-experimental/mdc-density/BUILD.bazel rename to src/material-experimental/mdc-core/density/BUILD.bazel index d9ae8041e100..e99bfa37a7e4 100644 --- a/src/material-experimental/mdc-density/BUILD.bazel +++ b/src/material-experimental/mdc-core/density/BUILD.bazel @@ -3,7 +3,7 @@ load("//tools:defaults.bzl", "sass_library") package(default_visibility = ["//visibility:public"]) filegroup( - name = "mdc-density", + name = "density", srcs = [":all_density"], ) @@ -12,6 +12,6 @@ sass_library( srcs = ["_all-density.scss"], deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-theming:all_themes", + "//src/material-experimental/mdc-core/theming:all_themes", ], ) diff --git a/src/material-experimental/mdc-core/density/_all-density.import.scss b/src/material-experimental/mdc-core/density/_all-density.import.scss new file mode 100644 index 000000000000..728c7b3af8da --- /dev/null +++ b/src/material-experimental/mdc-core/density/_all-density.import.scss @@ -0,0 +1,94 @@ +@forward '../../../material/core/theming/theming.import'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; +@forward '../../../material/core/core.import'; +@forward '../../mdc-button/button-theme' hide color, density, theme, typography; +@forward '../../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, +mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; +@forward '../../mdc-button/button-theme' as mat-mdc-button-* hide +$mat-mdc-button-mat-button-state-target; +@forward '../../mdc-button/fab-theme' as mat-mdc-fab-*; +@forward '../../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; +@forward '../../mdc-card/card-theme' hide color, density, theme, typography; +@forward '../../mdc-card/card-theme' as mat-mdc-card-* hide +$mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color; +@forward '../../mdc-checkbox/checkbox-theme' hide color, density, +private-checkbox-styles-with-color, theme, typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, +$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, +mat-mdc-typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide +$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, +mat-mdc-checkbox-private-checkbox-styles-with-color; +@forward '../../mdc-chips/chips-theme' hide color, density, theme, typography; +@forward '../../mdc-chips/chips-theme' as mat-mdc-chips-* hide +$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, +$mat-mdc-chips-mdc-chips-ink-color-default; +@forward '../../mdc-radio/radio-theme' hide color, density, theme, typography; +@forward '../../mdc-radio/radio-theme' as mat-mdc-radio-* hide +$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, +$mat-mdc-radio-mdc-radio-unchecked-color; +@forward '../../mdc-select/select-theme' hide color, density, theme, typography; +@forward '../../mdc-select/select-theme' as mat-mdc-select-* hide +$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, +$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, +$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; +@forward '../../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; +@forward '../../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide +$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; +@forward '../../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; +@forward '../../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide +$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, +$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; +@forward '../../mdc-tabs/tabs-theme' hide color, density, theme, typography; +@forward '../../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, +$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; +@forward '../../mdc-table/table-theme' hide color, density, theme, typography; +@forward '../../mdc-table/table-theme' as mat-mdc-table-* hide +$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, +$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, +$mat-mdc-table-mdc-data-table-selected-row-fill-color, +$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, +$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; +@forward '../../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; +@forward '../../mdc-form-field/form-field-sizing'; +@forward '../../mdc-form-field/form-field-native-select' hide private-form-field-native-select, +private-form-field-native-select-color; +@forward '../../mdc-form-field/form-field-native-select' as mat-mdc-* hide +$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, +$mat-mdc-mat-form-field-select-horizontal-end-padding; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' hide +private-text-field-refresh-theme-variables; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide +$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, +$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, +$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, +$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, +$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, +$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, +$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, +$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; +@forward '../core-theme.import'; +@forward '../../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; +@forward '../../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; +@forward '../../mdc-list/interactive-list-theme' as mat-mdc-*; +@forward '../../mdc-list/list-option-theme' as mat-mdc-*; +@forward '../../mdc-list/list-theme' as mat-mdc-list-*; +@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; +@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; +@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; +@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; +@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; +@forward '../../mdc-input/input-theme' as mat-mdc-input-*; +@forward '../../mdc-form-field/form-field-density' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-subscript' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; +@forward '../theming/all-theme'; +@forward 'all-density' show all-mdc-component-densities; + +@import '../theming/all-theme'; diff --git a/src/material-experimental/mdc-density/_all-density.scss b/src/material-experimental/mdc-core/density/_all-density.scss similarity index 95% rename from src/material-experimental/mdc-density/_all-density.scss rename to src/material-experimental/mdc-core/density/_all-density.scss index 78065b1453a1..b9d7f7997ef0 100644 --- a/src/material-experimental/mdc-density/_all-density.scss +++ b/src/material-experimental/mdc-core/density/_all-density.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; -@use '../mdc-theming/all-theme'; +@use '../theming/all-theme'; @mixin all-mdc-component-densities($config-or-theme) { // In case a theme object has been passed instead of a configuration for diff --git a/src/material-experimental/mdc-helpers/BUILD.bazel b/src/material-experimental/mdc-core/mdc-helpers/BUILD.bazel similarity index 100% rename from src/material-experimental/mdc-helpers/BUILD.bazel rename to src/material-experimental/mdc-core/mdc-helpers/BUILD.bazel diff --git a/src/material-experimental/mdc-helpers/README.md b/src/material-experimental/mdc-core/mdc-helpers/README.md similarity index 100% rename from src/material-experimental/mdc-helpers/README.md rename to src/material-experimental/mdc-core/mdc-helpers/README.md diff --git a/src/material-experimental/mdc-helpers/_focus-indicators-theme.scss b/src/material-experimental/mdc-core/mdc-helpers/_focus-indicators-theme.scss similarity index 100% rename from src/material-experimental/mdc-helpers/_focus-indicators-theme.scss rename to src/material-experimental/mdc-core/mdc-helpers/_focus-indicators-theme.scss diff --git a/src/material-experimental/mdc-helpers/_focus-indicators.import.scss b/src/material-experimental/mdc-core/mdc-helpers/_focus-indicators.import.scss similarity index 52% rename from src/material-experimental/mdc-helpers/_focus-indicators.import.scss rename to src/material-experimental/mdc-core/mdc-helpers/_focus-indicators.import.scss index 0ecd93997609..a1798456d1ec 100644 --- a/src/material-experimental/mdc-helpers/_focus-indicators.import.scss +++ b/src/material-experimental/mdc-core/mdc-helpers/_focus-indicators.import.scss @@ -1,10 +1,10 @@ -@forward '../../material/core/focus-indicators/focus-indicators.import'; +@forward '../../../material/core/focus-indicators/focus-indicators.import'; @forward 'focus-indicators' hide strong-focus-indicators; @forward 'focus-indicators-theme' hide color, theme; @forward 'focus-indicators' as mat-mdc-*; @forward 'focus-indicators-theme' as mat-mdc-strong-focus-indicators-* hide mat-mdc-strong-focus-indicators-border-color; -@import '../../material/core/theming/theming'; -@import '../../material/core/style/layout-common'; -@import '../../material/core/focus-indicators/focus-indicators'; +@import '../../../material/core/theming/theming'; +@import '../../../material/core/style/layout-common'; +@import '../../../material/core/focus-indicators/focus-indicators'; diff --git a/src/material-experimental/mdc-helpers/_focus-indicators.scss b/src/material-experimental/mdc-core/mdc-helpers/_focus-indicators.scss similarity index 100% rename from src/material-experimental/mdc-helpers/_focus-indicators.scss rename to src/material-experimental/mdc-core/mdc-helpers/_focus-indicators.scss diff --git a/src/material-experimental/mdc-core/mdc-helpers/_mdc-helpers.import.scss b/src/material-experimental/mdc-core/mdc-helpers/_mdc-helpers.import.scss new file mode 100644 index 000000000000..f13343d40c10 --- /dev/null +++ b/src/material-experimental/mdc-core/mdc-helpers/_mdc-helpers.import.scss @@ -0,0 +1,8 @@ +@forward '../../../material/core/theming/theming.import'; +@forward '../../../material/core/style/layout-common.import'; +@forward '../../../material/core/typography/typography.import'; +@forward 'mdc-helpers'; + +@import '../../../material/core/style/layout-common'; +@import '../../../material/core/theming/theming'; +@import '../../../material/core/typography/typography'; diff --git a/src/material-experimental/mdc-helpers/_mdc-helpers.scss b/src/material-experimental/mdc-core/mdc-helpers/_mdc-helpers.scss similarity index 100% rename from src/material-experimental/mdc-helpers/_mdc-helpers.scss rename to src/material-experimental/mdc-core/mdc-helpers/_mdc-helpers.scss diff --git a/src/material-experimental/mdc-core/option/_optgroup-theme.import.scss b/src/material-experimental/mdc-core/option/_optgroup-theme.import.scss index fa9c6989ccfa..48343ada6e76 100644 --- a/src/material-experimental/mdc-core/option/_optgroup-theme.import.scss +++ b/src/material-experimental/mdc-core/option/_optgroup-theme.import.scss @@ -1,7 +1,7 @@ @forward '../../../material/core/theming/theming.import'; -@forward '../../mdc-helpers/mdc-helpers.import'; -@forward '../../mdc-helpers/mdc-helpers'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; @forward 'optgroup-theme' as mat-mdc-optgroup-*; -@import '../../mdc-helpers/mdc-helpers'; +@import '../mdc-helpers/mdc-helpers'; @import '../../../material/core/theming/theming'; diff --git a/src/material-experimental/mdc-core/option/_optgroup-theme.scss b/src/material-experimental/mdc-core/option/_optgroup-theme.scss index 217e939190d8..0c829bd38725 100644 --- a/src/material-experimental/mdc-core/option/_optgroup-theme.scss +++ b/src/material-experimental/mdc-core/option/_optgroup-theme.scss @@ -1,7 +1,7 @@ @use '@material/theme/theme' as mdc-theme; @use '@angular/material' as mat; -@use '../../mdc-helpers/mdc-helpers'; +@use '../mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-core/option/_option-theme.import.scss b/src/material-experimental/mdc-core/option/_option-theme.import.scss index 905d5f914b78..f55c271f3743 100644 --- a/src/material-experimental/mdc-core/option/_option-theme.import.scss +++ b/src/material-experimental/mdc-core/option/_option-theme.import.scss @@ -1,7 +1,7 @@ @forward '../../../material/core/theming/theming.import'; -@forward '../../mdc-helpers/mdc-helpers.import'; -@forward '../../mdc-helpers/mdc-helpers'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; @forward 'option-theme' as mat-mdc-option-*; -@import '../../mdc-helpers/mdc-helpers'; +@import '../mdc-helpers/mdc-helpers'; @import '../../../material/core/theming/theming'; diff --git a/src/material-experimental/mdc-core/option/_option-theme.scss b/src/material-experimental/mdc-core/option/_option-theme.scss index 803acbb7e9fa..c1a53271d890 100644 --- a/src/material-experimental/mdc-core/option/_option-theme.scss +++ b/src/material-experimental/mdc-core/option/_option-theme.scss @@ -5,7 +5,7 @@ @use '@material/ripple' as mdc-ripple; @use '@angular/material' as mat; -@use '../../mdc-helpers/mdc-helpers'; +@use '../mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-core/option/optgroup.scss b/src/material-experimental/mdc-core/option/optgroup.scss index 6cbaf4319499..a8ca49f972ff 100644 --- a/src/material-experimental/mdc-core/option/optgroup.scss +++ b/src/material-experimental/mdc-core/option/optgroup.scss @@ -1,7 +1,7 @@ @use 'sass:map'; @use '@material/list/evolution-mixins' as mdc-list-mixins; @use '@material/list/evolution-variables' as mdc-list-variables; -@use '../../mdc-helpers/mdc-helpers'; +@use '../mdc-helpers/mdc-helpers'; .mat-mdc-optgroup-label { @include mdc-list-mixins.item-base; diff --git a/src/material-experimental/mdc-core/option/option.scss b/src/material-experimental/mdc-core/option/option.scss index 228c91258a5e..5998db2e8b57 100644 --- a/src/material-experimental/mdc-core/option/option.scss +++ b/src/material-experimental/mdc-core/option/option.scss @@ -4,7 +4,7 @@ @use '@material/list/evolution-variables' as mdc-list-variables; @use 'sass:map'; -@use '../../mdc-helpers/mdc-helpers'; +@use '../mdc-helpers/mdc-helpers'; .mat-mdc-option { @include mdc-list-mixins.item-base; diff --git a/src/material-experimental/mdc-theming/BUILD.bazel b/src/material-experimental/mdc-core/theming/BUILD.bazel similarity index 99% rename from src/material-experimental/mdc-theming/BUILD.bazel rename to src/material-experimental/mdc-core/theming/BUILD.bazel index 48dfa2c9efa6..22a9c843eb7d 100644 --- a/src/material-experimental/mdc-theming/BUILD.bazel +++ b/src/material-experimental/mdc-core/theming/BUILD.bazel @@ -3,7 +3,7 @@ load("//tools:defaults.bzl", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) filegroup( - name = "mdc-theming", + name = "theming", srcs = [ ":all_themes", ":deeppurple_amber_prebuilt", diff --git a/src/material-experimental/mdc-core/theming/_all-theme.import.scss b/src/material-experimental/mdc-core/theming/_all-theme.import.scss new file mode 100644 index 000000000000..daf816f42dc2 --- /dev/null +++ b/src/material-experimental/mdc-core/theming/_all-theme.import.scss @@ -0,0 +1,116 @@ +@forward '../../../material/core/theming/theming.import'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; +@forward '../../../material/core/core.import'; +@forward '../../mdc-button/button-theme' hide color, density, theme, typography; +@forward '../../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, +mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; +@forward '../../mdc-button/button-theme' as mat-mdc-button-* hide +$mat-mdc-button-mat-button-state-target; +@forward '../../mdc-button/fab-theme' as mat-mdc-fab-*; +@forward '../../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; +@forward '../../mdc-card/card-theme' hide color, density, theme, typography; +@forward '../../mdc-card/card-theme' as mat-mdc-card-* hide +$mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color; +@forward '../../mdc-checkbox/checkbox-theme' hide color, density, +private-checkbox-styles-with-color, theme, typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, +$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, +mat-mdc-typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide +$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, +mat-mdc-checkbox-private-checkbox-styles-with-color; +@forward '../../mdc-chips/chips-theme' hide color, density, theme, typography; +@forward '../../mdc-chips/chips-theme' as mat-mdc-chips-* hide +$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, +$mat-mdc-chips-mdc-chips-ink-color-default; +@forward '../../mdc-radio/radio-theme' hide color, density, theme, typography; +@forward '../../mdc-radio/radio-theme' as mat-mdc-radio-* hide +$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, +$mat-mdc-radio-mdc-radio-unchecked-color; +@forward '../../mdc-select/select-theme' hide color, density, theme, typography; +@forward '../../mdc-select/select-theme' as mat-mdc-select-* hide +$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, +$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, +$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; +@forward '../../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; +@forward '../../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide +$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; +@forward '../../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; +@forward '../../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide +$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, +$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; +@forward '../../mdc-tabs/tabs-theme' hide color, density, theme, typography; +@forward '../../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, +$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; +@forward '../../mdc-table/table-theme' hide color, density, theme, typography; +@forward '../../mdc-table/table-theme' as mat-mdc-table-* hide +$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, +$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, +$mat-mdc-table-mdc-data-table-selected-row-fill-color, +$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, +$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; +@forward '../../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; +@forward '../../mdc-form-field/form-field-sizing'; +@forward '../../mdc-form-field/form-field-native-select' hide private-form-field-native-select, +private-form-field-native-select-color; +@forward '../../mdc-form-field/form-field-native-select' as mat-mdc-* hide +$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, +$mat-mdc-mat-form-field-select-horizontal-end-padding; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' hide +private-text-field-refresh-theme-variables; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide +$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, +$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, +$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, +$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, +$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, +$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, +$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, +$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; +@forward '../core-theme.import'; +@forward '../../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; +@forward '../../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; +@forward '../../mdc-list/interactive-list-theme' as mat-mdc-*; +@forward '../../mdc-list/list-option-theme' as mat-mdc-*; +@forward '../../mdc-list/list-theme' as mat-mdc-list-*; +@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; +@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; +@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; +@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; +@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; +@forward '../../mdc-input/input-theme' as mat-mdc-input-*; +@forward '../../mdc-form-field/form-field-density' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-subscript' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; +@forward 'all-theme' hide all-mdc-component-themes;; + +@import '../core-theme'; +@import '../../mdc-autocomplete/autocomplete-theme'; +@import '../../mdc-button/button-theme'; +@import '../../mdc-card/card-theme'; +@import '../../mdc-checkbox/checkbox-theme'; +@import '../../mdc-chips/chips-theme'; +@import '../../mdc-dialog/dialog-theme'; +@import '../../mdc-list/list-theme'; +@import '../../mdc-menu/menu-theme'; +@import '../../mdc-radio/radio-theme'; +@import '../../mdc-select/select-theme'; +@import '../../mdc-slide-toggle/slide-toggle-theme'; +@import '../../mdc-snack-bar/snack-bar-theme'; +@import '../../mdc-tabs/tabs-theme'; +@import '../../mdc-table/table-theme'; +@import '../../mdc-tooltip/tooltip-theme'; +@import '../../mdc-paginator/paginator-theme'; +@import '../../mdc-progress-bar/progress-bar-theme'; +@import '../../mdc-progress-spinner/progress-spinner-theme'; +@import '../../mdc-input/input-theme'; +@import '../../mdc-form-field/form-field-theme'; +@import '../../../material/core/core'; +@import '../../../material/core/core-theme'; +@import '../../../material/core/theming/theming'; diff --git a/src/material-experimental/mdc-theming/_all-theme.scss b/src/material-experimental/mdc-core/theming/_all-theme.scss similarity index 65% rename from src/material-experimental/mdc-theming/_all-theme.scss rename to src/material-experimental/mdc-core/theming/_all-theme.scss index 5e848217caee..1173a8b5e9b7 100644 --- a/src/material-experimental/mdc-theming/_all-theme.scss +++ b/src/material-experimental/mdc-core/theming/_all-theme.scss @@ -1,29 +1,29 @@ @use '@angular/material' as mat; -@use '../mdc-core/core-theme'; -@use '../mdc-autocomplete/autocomplete-theme'; -@use '../mdc-button/button-theme'; -@use '../mdc-button/fab-theme'; -@use '../mdc-button/icon-button-theme'; -@use '../mdc-card/card-theme'; -@use '../mdc-checkbox/checkbox-theme'; -@use '../mdc-chips/chips-theme'; -@use '../mdc-dialog/dialog-theme'; -@use '../mdc-list/list-theme'; -@use '../mdc-menu/menu-theme'; -@use '../mdc-radio/radio-theme'; -@use '../mdc-select/select-theme'; -@use '../mdc-slide-toggle/slide-toggle-theme'; -@use '../mdc-slider/slider-theme'; -@use '../mdc-snack-bar/snack-bar-theme'; -@use '../mdc-tabs/tabs-theme'; -@use '../mdc-table/table-theme'; -@use '../mdc-tooltip/tooltip-theme'; -@use '../mdc-paginator/paginator-theme'; -@use '../mdc-progress-bar/progress-bar-theme'; -@use '../mdc-progress-spinner/progress-spinner-theme'; -@use '../mdc-input/input-theme'; -@use '../mdc-form-field/form-field-theme'; +@use '../core-theme'; +@use '../../mdc-autocomplete/autocomplete-theme'; +@use '../../mdc-button/button-theme'; +@use '../../mdc-button/fab-theme'; +@use '../../mdc-button/icon-button-theme'; +@use '../../mdc-card/card-theme'; +@use '../../mdc-checkbox/checkbox-theme'; +@use '../../mdc-chips/chips-theme'; +@use '../../mdc-dialog/dialog-theme'; +@use '../../mdc-list/list-theme'; +@use '../../mdc-menu/menu-theme'; +@use '../../mdc-radio/radio-theme'; +@use '../../mdc-select/select-theme'; +@use '../../mdc-slide-toggle/slide-toggle-theme'; +@use '../../mdc-slider/slider-theme'; +@use '../../mdc-snack-bar/snack-bar-theme'; +@use '../../mdc-tabs/tabs-theme'; +@use '../../mdc-table/table-theme'; +@use '../../mdc-tooltip/tooltip-theme'; +@use '../../mdc-paginator/paginator-theme'; +@use '../../mdc-progress-bar/progress-bar-theme'; +@use '../../mdc-progress-spinner/progress-spinner-theme'; +@use '../../mdc-input/input-theme'; +@use '../../mdc-form-field/form-field-theme'; @mixin all-mdc-component-themes($theme-or-color-config) { $dedupe-key: 'angular-material-mdc-theme'; diff --git a/src/material-experimental/mdc-theming/prebuilt/deeppurple-amber.scss b/src/material-experimental/mdc-core/theming/prebuilt/deeppurple-amber.scss similarity index 100% rename from src/material-experimental/mdc-theming/prebuilt/deeppurple-amber.scss rename to src/material-experimental/mdc-core/theming/prebuilt/deeppurple-amber.scss diff --git a/src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss b/src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.scss similarity index 100% rename from src/material-experimental/mdc-theming/prebuilt/indigo-pink.scss rename to src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.scss diff --git a/src/material-experimental/mdc-theming/prebuilt/pink-bluegrey.scss b/src/material-experimental/mdc-core/theming/prebuilt/pink-bluegrey.scss similarity index 100% rename from src/material-experimental/mdc-theming/prebuilt/pink-bluegrey.scss rename to src/material-experimental/mdc-core/theming/prebuilt/pink-bluegrey.scss diff --git a/src/material-experimental/mdc-theming/prebuilt/purple-green.scss b/src/material-experimental/mdc-core/theming/prebuilt/purple-green.scss similarity index 100% rename from src/material-experimental/mdc-theming/prebuilt/purple-green.scss rename to src/material-experimental/mdc-core/theming/prebuilt/purple-green.scss diff --git a/src/material-experimental/mdc-typography/BUILD.bazel b/src/material-experimental/mdc-core/typography/BUILD.bazel similarity index 75% rename from src/material-experimental/mdc-typography/BUILD.bazel rename to src/material-experimental/mdc-core/typography/BUILD.bazel index a1323eb67d11..70ef3a9e19bd 100644 --- a/src/material-experimental/mdc-typography/BUILD.bazel +++ b/src/material-experimental/mdc-core/typography/BUILD.bazel @@ -3,7 +3,7 @@ load("//tools:defaults.bzl", "sass_library") package(default_visibility = ["//visibility:public"]) filegroup( - name = "mdc-typography", + name = "typography", srcs = [":all_typography"], ) @@ -12,6 +12,6 @@ sass_library( srcs = ["_all-typography.scss"], deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-theming:all_themes", + "//src/material-experimental/mdc-core/theming:all_themes", ], ) diff --git a/src/material-experimental/mdc-core/typography/_all-typography.import.scss b/src/material-experimental/mdc-core/typography/_all-typography.import.scss new file mode 100644 index 000000000000..7a7f43befba8 --- /dev/null +++ b/src/material-experimental/mdc-core/typography/_all-typography.import.scss @@ -0,0 +1,97 @@ +@forward '../../../material/core/theming/theming.import'; +@forward '../mdc-helpers/mdc-helpers.import'; +@forward '../mdc-helpers/mdc-helpers'; +@forward '../../../material/core/core.import'; +@forward '../../mdc-button/button-theme' hide color, density, theme, typography; +@forward '../../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, +mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; +@forward '../../mdc-button/button-theme' as mat-mdc-button-* hide +$mat-mdc-button-mat-button-state-target; +@forward '../../mdc-button/fab-theme' as mat-mdc-fab-*; +@forward '../../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; +@forward '../../mdc-card/card-theme' hide color, density, theme, typography; +@forward '../../mdc-card/card-theme' as mat-mdc-card-* hide +$mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color; +@forward '../../mdc-checkbox/checkbox-theme' hide color, density, +private-checkbox-styles-with-color, theme, typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, +$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, +mat-mdc-typography; +@forward '../../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide +$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, +mat-mdc-checkbox-private-checkbox-styles-with-color; +@forward '../../mdc-chips/chips-theme' hide color, density, theme, typography; +@forward '../../mdc-chips/chips-theme' as mat-mdc-chips-* hide +$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, +$mat-mdc-chips-mdc-chips-ink-color-default; +@forward '../../mdc-radio/radio-theme' hide color, density, theme, typography; +@forward '../../mdc-radio/radio-theme' as mat-mdc-radio-* hide +$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, +$mat-mdc-radio-mdc-radio-unchecked-color; +@forward '../../mdc-select/select-theme' hide color, density, theme, typography; +@forward '../../mdc-select/select-theme' as mat-mdc-select-* hide +$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, +$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, +$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; +@forward '../../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; +@forward '../../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide +$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, +$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; +@forward '../../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; +@forward '../../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide +$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, +$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; +@forward '../../mdc-tabs/tabs-theme' hide color, density, theme, typography; +@forward '../../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, +$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; +@forward '../../mdc-table/table-theme' hide color, density, theme, typography; +@forward '../../mdc-table/table-theme' as mat-mdc-table-* hide +$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, +$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, +$mat-mdc-table-mdc-data-table-selected-row-fill-color, +$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, +$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; +@forward '../../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; +@forward '../../mdc-form-field/form-field-sizing'; +@forward '../../mdc-form-field/form-field-native-select' hide private-form-field-native-select, +private-form-field-native-select-color; +@forward '../../mdc-form-field/form-field-native-select' as mat-mdc-* hide +$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, +$mat-mdc-mat-form-field-select-horizontal-end-padding; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' hide +private-text-field-refresh-theme-variables; +@forward '../../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide +$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, +$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, +$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, +$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, +$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, +$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, +$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, +$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; +@forward '../core-theme.import'; +@forward '../../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; +@forward '../../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; +@forward '../../mdc-list/interactive-list-theme' as mat-mdc-*; +@forward '../../mdc-list/list-option-theme' as mat-mdc-*; +@forward '../../mdc-list/list-theme' as mat-mdc-list-*; +@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; +@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; +@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; +@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; +@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; +@forward '../../mdc-input/input-theme' as mat-mdc-input-*; +@forward '../../mdc-form-field/form-field-density' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-subscript' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; +@forward '../../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; +@forward '../theming/all-theme'; +@forward 'all-typography' hide define-mdc-typography-config, all-mdc-component-typographies; +@forward 'all-typography' as mat-mdc-typography-* hide +mat-mdc-typography-all-mdc-component-typographies, mat-mdc-typography-define-mdc-typography-config, +mat-mdc-typography-mat-mdc-typography-config; + +@import '../theming/all-theme'; diff --git a/src/material-experimental/mdc-typography/_all-typography.scss b/src/material-experimental/mdc-core/typography/_all-typography.scss similarity index 99% rename from src/material-experimental/mdc-typography/_all-typography.scss rename to src/material-experimental/mdc-core/typography/_all-typography.scss index cc46af118264..29fe412b6d82 100644 --- a/src/material-experimental/mdc-typography/_all-typography.scss +++ b/src/material-experimental/mdc-core/typography/_all-typography.scss @@ -2,7 +2,7 @@ @use '@material/typography' as mdc-typography; @use 'sass:map'; -@use '../mdc-theming/all-theme'; +@use '../theming/all-theme'; @use '../mdc-helpers/mdc-helpers'; /// Generates an Angular Material typography config based on values from the official Material diff --git a/src/material-experimental/mdc-density/_all-density.import.scss b/src/material-experimental/mdc-density/_all-density.import.scss deleted file mode 100644 index 35159c73fdf9..000000000000 --- a/src/material-experimental/mdc-density/_all-density.import.scss +++ /dev/null @@ -1,94 +0,0 @@ -@forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; -@forward '../../material/core/core.import'; -@forward '../mdc-button/button-theme' hide color, density, theme, typography; -@forward '../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, -mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; -@forward '../mdc-button/button-theme' as mat-mdc-button-* hide -$mat-mdc-button-mat-button-state-target; -@forward '../mdc-button/fab-theme' as mat-mdc-fab-*; -@forward '../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; -@forward '../mdc-card/card-theme' hide color, density, theme, typography; -@forward '../mdc-card/card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, -$mat-mdc-card-mdc-card-outline-color; -@forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, -theme, typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, -$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, -mat-mdc-typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide -$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, -mat-mdc-checkbox-private-checkbox-styles-with-color; -@forward '../mdc-chips/chips-theme' hide color, density, theme, typography; -@forward '../mdc-chips/chips-theme' as mat-mdc-chips-* hide -$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, -$mat-mdc-chips-mdc-chips-ink-color-default; -@forward '../mdc-radio/radio-theme' hide color, density, theme, typography; -@forward '../mdc-radio/radio-theme' as mat-mdc-radio-* hide -$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, -$mat-mdc-radio-mdc-radio-unchecked-color; -@forward '../mdc-select/select-theme' hide color, density, theme, typography; -@forward '../mdc-select/select-theme' as mat-mdc-select-* hide -$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, -$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, -$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; -@forward '../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; -@forward '../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide -$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; -@forward '../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; -@forward '../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide -$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, -$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; -@forward '../mdc-tabs/tabs-theme' hide color, density, theme, typography; -@forward '../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, -$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; -@forward '../mdc-table/table-theme' hide color, density, theme, typography; -@forward '../mdc-table/table-theme' as mat-mdc-table-* hide -$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, -$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, -$mat-mdc-table-mdc-data-table-selected-row-fill-color, -$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, -$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; -@forward '../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; -@forward '../mdc-form-field/form-field-sizing'; -@forward '../mdc-form-field/form-field-native-select' hide private-form-field-native-select, -private-form-field-native-select-color; -@forward '../mdc-form-field/form-field-native-select' as mat-mdc-* hide -$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, -$mat-mdc-mat-form-field-select-horizontal-end-padding; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' hide -private-text-field-refresh-theme-variables; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide -$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, -$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, -$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, -$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, -$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, -$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, -$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, -$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; -@forward '../mdc-core/core-theme.import'; -@forward '../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; -@forward '../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; -@forward '../mdc-list/interactive-list-theme' as mat-mdc-*; -@forward '../mdc-list/list-option-theme' as mat-mdc-*; -@forward '../mdc-list/list-theme' as mat-mdc-list-*; -@forward '../mdc-menu/menu-theme' as mat-mdc-menu-*; -@forward '../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; -@forward '../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; -@forward '../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; -@forward '../mdc-input/input-theme' as mat-mdc-input-*; -@forward '../mdc-form-field/form-field-density' as mat-mdc-*; -@forward '../mdc-form-field/form-field-subscript' as mat-mdc-*; -@forward '../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; -@forward '../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; -@forward '../mdc-theming/all-theme'; -@forward 'all-density' show all-mdc-component-densities; - -@import '../mdc-theming/all-theme'; diff --git a/src/material-experimental/mdc-dialog/BUILD.bazel b/src/material-experimental/mdc-dialog/BUILD.bazel index 92687dc5d1be..76ed8565dc51 100644 --- a/src/material-experimental/mdc-dialog/BUILD.bazel +++ b/src/material-experimental/mdc-dialog/BUILD.bazel @@ -32,8 +32,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -45,8 +45,8 @@ sass_binary( ], deps = [ ":mdc_dialog_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-dialog/README.md b/src/material-experimental/mdc-dialog/README.md index 2533cb2c37cd..f59d4c013700 100644 --- a/src/material-experimental/mdc-dialog/README.md +++ b/src/material-experimental/mdc-dialog/README.md @@ -47,7 +47,7 @@ component by following these steps: 5. Ensure color and typography styles for `@angular/material-experimental` are set up. Either use a custom theme and use the `mat-mdc-dialog-theme` mixin, or use a prebuilt theme - from `@angular/material-experimental/mdc-theming/prebuilt`. + from `@angular/material-experimental/mdc-core/theming/prebuilt`. ## API differences diff --git a/src/material-experimental/mdc-dialog/_dialog-theme.import.scss b/src/material-experimental/mdc-dialog/_dialog-theme.import.scss index e318c768b4ec..b797508d37e0 100644 --- a/src/material-experimental/mdc-dialog/_dialog-theme.import.scss +++ b/src/material-experimental/mdc-dialog/_dialog-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'dialog-theme' as mat-mdc-dialog-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-dialog/_dialog-theme.scss b/src/material-experimental/mdc-dialog/_dialog-theme.scss index 81febc0465b1..fa526353409c 100644 --- a/src/material-experimental/mdc-dialog/_dialog-theme.scss +++ b/src/material-experimental/mdc-dialog/_dialog-theme.scss @@ -5,7 +5,7 @@ @use '@material/theme/theme-color' as mdc-theme-color; @use '@material/typography' as mdc-typography; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-dialog/dialog.scss b/src/material-experimental/mdc-dialog/dialog.scss index e30e63ed4747..b71bcf819209 100644 --- a/src/material-experimental/mdc-dialog/dialog.scss +++ b/src/material-experimental/mdc-dialog/dialog.scss @@ -1,6 +1,6 @@ @use '@material/dialog' as mdc-dialog; @use '@material/dialog/dialog-theme' as mdc-dialog-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './mdc-dialog-structure-overrides'; // Theme map with values for variables that will be overriden in the theme. diff --git a/src/material-experimental/mdc-form-field/BUILD.bazel b/src/material-experimental/mdc-form-field/BUILD.bazel index cbbb6da0d847..90f07281b498 100644 --- a/src/material-experimental/mdc-form-field/BUILD.bazel +++ b/src/material-experimental/mdc-form-field/BUILD.bazel @@ -35,8 +35,8 @@ sass_library( deps = [ ":form_field_partials", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -48,8 +48,8 @@ sass_binary( ], deps = [ ":form_field_partials", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -68,6 +68,6 @@ sass_library( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-form-field/README.md b/src/material-experimental/mdc-form-field/README.md index a62cb97a6472..2ead52c61fb2 100644 --- a/src/material-experimental/mdc-form-field/README.md +++ b/src/material-experimental/mdc-form-field/README.md @@ -46,7 +46,7 @@ component by following these steps: 5. Ensure color and typography styles for `@angular/material-experimental` are set up. Either use a custom theme and use the `mat-mdc-form-field-theme` mixin, or use a prebuilt theme - from `@angular/material-experimental/mdc-theming/prebuilt`. + from `@angular/material-experimental/mdc-core/theming/prebuilt`. ## API differences diff --git a/src/material-experimental/mdc-form-field/_form-field-native-select.scss b/src/material-experimental/mdc-form-field/_form-field-native-select.scss index 99e53f8016bb..f850247f0782 100644 --- a/src/material-experimental/mdc-form-field/_form-field-native-select.scss +++ b/src/material-experimental/mdc-form-field/_form-field-native-select.scss @@ -3,7 +3,7 @@ @use '@angular/material' as mat; @use '@material/theme/theme-color' as mdc-theme-color; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Width of the Material Design form-field select arrow. $mat-form-field-select-arrow-width: 10px; diff --git a/src/material-experimental/mdc-form-field/_form-field-subscript.import.scss b/src/material-experimental/mdc-form-field/_form-field-subscript.import.scss index 9bacbb4a2d7b..3d55b9d3427c 100644 --- a/src/material-experimental/mdc-form-field/_form-field-subscript.import.scss +++ b/src/material-experimental/mdc-form-field/_form-field-subscript.import.scss @@ -1,7 +1,7 @@ @forward 'form-field-sizing'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'form-field-subscript' as mat-mdc-*; @import 'form-field-sizing'; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-form-field/_form-field-subscript.scss b/src/material-experimental/mdc-form-field/_form-field-subscript.scss index 3b35c2a8c16c..10e74f9323fc 100644 --- a/src/material-experimental/mdc-form-field/_form-field-subscript.scss +++ b/src/material-experimental/mdc-form-field/_form-field-subscript.scss @@ -6,7 +6,7 @@ @use '@material/textfield/variables' as mdc-textfield-variables; @use './form-field-sizing'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin private-form-field-subscript() { // Wrapper for the hints and error messages. diff --git a/src/material-experimental/mdc-form-field/_form-field-theme.import.scss b/src/material-experimental/mdc-form-field/_form-field-theme.import.scss index 08499d4f68c2..9957fd47b4a4 100644 --- a/src/material-experimental/mdc-form-field/_form-field-theme.import.scss +++ b/src/material-experimental/mdc-form-field/_form-field-theme.import.scss @@ -1,6 +1,6 @@ @forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'form-field-sizing'; @forward 'form-field-native-select' hide private-form-field-native-select, private-form-field-native-select-color; @@ -24,7 +24,7 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward 'form-field-theme' hide color, density, theme, typography; @forward 'form-field-theme' as mat-mdc-form-field-* hide mat-mdc-form-field-text-field-color-styles; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; @import 'form-field-density'; @import 'form-field-subscript'; @import 'form-field-focus-overlay'; diff --git a/src/material-experimental/mdc-form-field/_form-field-theme.scss b/src/material-experimental/mdc-form-field/_form-field-theme.scss index 31bf17c737e7..9907201a8ec5 100644 --- a/src/material-experimental/mdc-form-field/_form-field-theme.scss +++ b/src/material-experimental/mdc-form-field/_form-field-theme.scss @@ -6,7 +6,7 @@ @use '@material/theme/theme-color' as mdc-theme-color; @use '@material/typography/typography' as mdc-typography; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './form-field-density'; @use './form-field-subscript'; @use './form-field-focus-overlay'; diff --git a/src/material-experimental/mdc-form-field/form-field.scss b/src/material-experimental/mdc-form-field/form-field.scss index eb753608b578..0ef5457bd29a 100644 --- a/src/material-experimental/mdc-form-field/form-field.scss +++ b/src/material-experimental/mdc-form-field/form-field.scss @@ -9,7 +9,7 @@ @use './form-field-native-select'; @use './mdc-text-field-textarea-overrides'; @use './mdc-text-field-structure-overrides'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Base styles for MDC text-field, notched-outline, floating label and line-ripple. @include mdc-helpers.disable-fallback-declarations { diff --git a/src/material-experimental/mdc-helpers/_mdc-helpers.import.scss b/src/material-experimental/mdc-helpers/_mdc-helpers.import.scss deleted file mode 100644 index 6674d0b4bf4c..000000000000 --- a/src/material-experimental/mdc-helpers/_mdc-helpers.import.scss +++ /dev/null @@ -1,8 +0,0 @@ -@forward '../../material/core/theming/theming.import'; -@forward '../../material/core/style/layout-common.import'; -@forward '../../material/core/typography/typography.import'; -@forward 'mdc-helpers'; - -@import '../../material/core/style/layout-common'; -@import '../../material/core/theming/theming'; -@import '../../material/core/typography/typography'; diff --git a/src/material-experimental/mdc-input/BUILD.bazel b/src/material-experimental/mdc-input/BUILD.bazel index 7f1b9d731035..7599f9ed368f 100644 --- a/src/material-experimental/mdc-input/BUILD.bazel +++ b/src/material-experimental/mdc-input/BUILD.bazel @@ -31,7 +31,7 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", ], ) diff --git a/src/material-experimental/mdc-input/README.md b/src/material-experimental/mdc-input/README.md index 9f5f6cd2356c..32fc98c4f7bc 100644 --- a/src/material-experimental/mdc-input/README.md +++ b/src/material-experimental/mdc-input/README.md @@ -55,7 +55,7 @@ component by following these steps: 5. Ensure color and typography styles for `@angular/material-experimental` are set up. The input itself does not provide any styles. If an input is used inside of the MDC-based `mat-mdc-form-field`, either use a custom theme with the `mat-form-field-theme` mixin, or use - a prebuilt theme from `@angular/material-experimental/mdc-theming/prebuilt`. + a prebuilt theme from `@angular/material-experimental/mdc-core/theming/prebuilt`. ## API differences diff --git a/src/material-experimental/mdc-input/_input-theme.import.scss b/src/material-experimental/mdc-input/_input-theme.import.scss index afa024674db4..1850c9021abf 100644 --- a/src/material-experimental/mdc-input/_input-theme.import.scss +++ b/src/material-experimental/mdc-input/_input-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'input-theme' as mat-mdc-input-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-input/_input-theme.scss b/src/material-experimental/mdc-input/_input-theme.scss index 3c6820de37d6..f29c074a5bdb 100644 --- a/src/material-experimental/mdc-input/_input-theme.scss +++ b/src/material-experimental/mdc-input/_input-theme.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-list/BUILD.bazel b/src/material-experimental/mdc-list/BUILD.bazel index ac88d03b8f19..11ac85506d2a 100644 --- a/src/material-experimental/mdc-list/BUILD.bazel +++ b/src/material-experimental/mdc-list/BUILD.bazel @@ -42,8 +42,8 @@ sass_library( deps = [ "//src/material:sass_lib", "//src/material-experimental/mdc-checkbox:mdc_checkbox_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -55,8 +55,8 @@ sass_binary( ], deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -69,8 +69,8 @@ sass_binary( deps = [ ":mdc_list_scss_lib", "//src/cdk:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-list/_interactive-list-theme.import.scss b/src/material-experimental/mdc-list/_interactive-list-theme.import.scss index 98378781cba9..f13081a8466e 100644 --- a/src/material-experimental/mdc-list/_interactive-list-theme.import.scss +++ b/src/material-experimental/mdc-list/_interactive-list-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'interactive-list-theme' as mat-mdc-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-list/_list-option-theme.import.scss b/src/material-experimental/mdc-list/_list-option-theme.import.scss index 285b05be36e5..a1ef785e9f3a 100644 --- a/src/material-experimental/mdc-list/_list-option-theme.import.scss +++ b/src/material-experimental/mdc-list/_list-option-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, theme, typography; @forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, diff --git a/src/material-experimental/mdc-list/_list-option-theme.scss b/src/material-experimental/mdc-list/_list-option-theme.scss index 5faeb2372468..c70aca1e1ec3 100644 --- a/src/material-experimental/mdc-list/_list-option-theme.scss +++ b/src/material-experimental/mdc-list/_list-option-theme.scss @@ -1,6 +1,6 @@ @use '@material/checkbox' as mdc-checkbox; @use '../mdc-checkbox/checkbox-private'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './list-option-trailing-avatar-compat'; // Mixin that overrides the selected item and checkbox colors for list options. By diff --git a/src/material-experimental/mdc-list/_list-option-trailing-avatar-compat.scss b/src/material-experimental/mdc-list/_list-option-trailing-avatar-compat.scss index 1a26a351bb0c..dd891bbda59f 100644 --- a/src/material-experimental/mdc-list/_list-option-trailing-avatar-compat.scss +++ b/src/material-experimental/mdc-list/_list-option-trailing-avatar-compat.scss @@ -3,7 +3,7 @@ @use '@material/density/functions' as density-functions; @use '@material/list/evolution-mixins' as mdc-list; @use '@material/list/evolution-variables' as mdc-list-variables; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // For compatibility with the non-MDC selection list, we support avatars that are // shown at the end of the list option. This is not supported by the MDC list as the diff --git a/src/material-experimental/mdc-list/_list-theme.import.scss b/src/material-experimental/mdc-list/_list-theme.import.scss index ac7275de24b5..14bbf3a41095 100644 --- a/src/material-experimental/mdc-list/_list-theme.import.scss +++ b/src/material-experimental/mdc-list/_list-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, theme, typography; @forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, @@ -14,4 +14,4 @@ mat-mdc-checkbox-private-checkbox-styles-with-color; @import './interactive-list-theme'; @import './list-option-theme'; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-list/_list-theme.scss b/src/material-experimental/mdc-list/_list-theme.scss index 441bf4cedea5..78aa811bc9ba 100644 --- a/src/material-experimental/mdc-list/_list-theme.scss +++ b/src/material-experimental/mdc-list/_list-theme.scss @@ -4,7 +4,7 @@ @use './interactive-list-theme'; @use './list-option-theme'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-list/list-option.scss b/src/material-experimental/mdc-list/list-option.scss index 6e228993792d..85b5d554a2a7 100644 --- a/src/material-experimental/mdc-list/list-option.scss +++ b/src/material-experimental/mdc-list/list-option.scss @@ -4,7 +4,7 @@ @use '@material/list/evolution-variables' as mdc-list-variables; @use '@material/checkbox/checkbox-theme' as mdc-checkbox-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use '../mdc-checkbox/checkbox-private'; @use './list-option-trailing-avatar-compat'; diff --git a/src/material-experimental/mdc-list/list.scss b/src/material-experimental/mdc-list/list.scss index 9f15b503d6de..d7b019488e0e 100644 --- a/src/material-experimental/mdc-list/list.scss +++ b/src/material-experimental/mdc-list/list.scss @@ -1,7 +1,7 @@ @use '@angular/material' as mat; @use '@material/list/evolution-mixins' as mdc-list; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-list.without-ripple($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index ad09af966dc2..ef1938329554 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -36,8 +36,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -50,8 +50,8 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-menu/_menu-theme.import.scss b/src/material-experimental/mdc-menu/_menu-theme.import.scss index 1533f4f8be1c..210c95b0c54d 100644 --- a/src/material-experimental/mdc-menu/_menu-theme.import.scss +++ b/src/material-experimental/mdc-menu/_menu-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'menu-theme' as mat-mdc-menu-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-menu/_menu-theme.scss b/src/material-experimental/mdc-menu/_menu-theme.scss index e75b108fe9de..5cba824b0632 100644 --- a/src/material-experimental/mdc-menu/_menu-theme.scss +++ b/src/material-experimental/mdc-menu/_menu-theme.scss @@ -6,7 +6,7 @@ @use '@material/typography' as mdc-typography; @use '@material/ripple' as mdc-ripple; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-menu/menu.scss b/src/material-experimental/mdc-menu/menu.scss index 59ed142be4f0..176320e88c56 100644 --- a/src/material-experimental/mdc-menu/menu.scss +++ b/src/material-experimental/mdc-menu/menu.scss @@ -5,7 +5,7 @@ @use '@material/list/evolution-mixins' as mdc-list-mixins; @use '@material/list/evolution-variables' as mdc-list-variables; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-menu-surface.core-styles($query: structure); diff --git a/src/material-experimental/mdc-paginator/BUILD.bazel b/src/material-experimental/mdc-paginator/BUILD.bazel index 4d42cbf599e6..569d269bbd57 100644 --- a/src/material-experimental/mdc-paginator/BUILD.bazel +++ b/src/material-experimental/mdc-paginator/BUILD.bazel @@ -33,8 +33,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-paginator/_paginator-theme.import.scss b/src/material-experimental/mdc-paginator/_paginator-theme.import.scss index 35f07688ffbe..89a17178b2fd 100644 --- a/src/material-experimental/mdc-paginator/_paginator-theme.import.scss +++ b/src/material-experimental/mdc-paginator/_paginator-theme.import.scss @@ -1,9 +1,9 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'paginator-variables' as mat-mdc-paginator-*; @forward 'paginator-theme' as mat-mdc-paginator-*; @import '../../material/core/theming/theming'; @import '../../material/core/density/private/compatibility'; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; @import './paginator-variables'; diff --git a/src/material-experimental/mdc-paginator/_paginator-theme.scss b/src/material-experimental/mdc-paginator/_paginator-theme.scss index 38fad13d33d7..eb38107a7b88 100644 --- a/src/material-experimental/mdc-paginator/_paginator-theme.scss +++ b/src/material-experimental/mdc-paginator/_paginator-theme.scss @@ -3,7 +3,7 @@ @use '@material/typography' as mdc-typography; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @use './paginator-variables'; @mixin color($config-or-theme) { diff --git a/src/material-experimental/mdc-progress-bar/BUILD.bazel b/src/material-experimental/mdc-progress-bar/BUILD.bazel index 5a21a84daf44..6164530a58b3 100644 --- a/src/material-experimental/mdc-progress-bar/BUILD.bazel +++ b/src/material-experimental/mdc-progress-bar/BUILD.bazel @@ -32,8 +32,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -44,8 +44,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss index b23d93971772..6a864565d370 100644 --- a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss +++ b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss @@ -1,6 +1,6 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'progress-bar-theme' hide color, density, theme, typography; @forward 'progress-bar-theme' as mat-mdc-progress-bar-* hide mat-mdc-progress-bar-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss index 60eed77e6ddc..12479517f1a4 100644 --- a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss +++ b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss @@ -3,7 +3,7 @@ @use '@material/linear-progress' as mdc-linear-progress; @use 'sass:color'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin _palette-styles($color) { // TODO(crisbeto): the buffer color should come from somewhere in MDC, however at the time of diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.scss b/src/material-experimental/mdc-progress-bar/progress-bar.scss index 22aab33a2208..d0569286c089 100644 --- a/src/material-experimental/mdc-progress-bar/progress-bar.scss +++ b/src/material-experimental/mdc-progress-bar/progress-bar.scss @@ -1,5 +1,5 @@ @use '@material/linear-progress' as mdc-linear-progress; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-linear-progress.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-progress-spinner/BUILD.bazel b/src/material-experimental/mdc-progress-spinner/BUILD.bazel index 0deaa8b7eca1..aa848f6b0c10 100644 --- a/src/material-experimental/mdc-progress-spinner/BUILD.bazel +++ b/src/material-experimental/mdc-progress-spinner/BUILD.bazel @@ -34,8 +34,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -46,8 +46,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.import.scss b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.import.scss index bf6ea688d361..6a295ec41b62 100644 --- a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.import.scss +++ b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.import.scss @@ -1,6 +1,6 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'progress-spinner-theme' hide color, density, theme, typography; @forward 'progress-spinner-theme' as mat-mdc-progress-spinner-* hide mat-mdc-progress-spinner-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss index c6a373477652..6de7598628e4 100644 --- a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss +++ b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss @@ -1,7 +1,7 @@ @use '@angular/material' as mat; @use '@material/circular-progress' as mdc-circular-progress; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin _palette-styles($color) { @include mdc-circular-progress.color($color, $query: mdc-helpers.$mat-theme-styles-query); diff --git a/src/material-experimental/mdc-progress-spinner/progress-spinner.scss b/src/material-experimental/mdc-progress-spinner/progress-spinner.scss index a7f0a3d63044..fe00864bc592 100644 --- a/src/material-experimental/mdc-progress-spinner/progress-spinner.scss +++ b/src/material-experimental/mdc-progress-spinner/progress-spinner.scss @@ -1,7 +1,7 @@ @use '@angular/cdk'; @use '@material/circular-progress' as mdc-circular-progress; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-circular-progress.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index 2f476b97eed2..5149868fc64f 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -34,8 +34,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -48,8 +48,8 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-radio/_radio-theme.import.scss b/src/material-experimental/mdc-radio/_radio-theme.import.scss index 941589dfb587..b165045fa188 100644 --- a/src/material-experimental/mdc-radio/_radio-theme.import.scss +++ b/src/material-experimental/mdc-radio/_radio-theme.import.scss @@ -1,7 +1,7 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'radio-theme' hide color, density, theme, typography; @forward 'radio-theme' as mat-mdc-radio-* hide $mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, $mat-mdc-radio-mdc-radio-unchecked-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-radio/_radio-theme.scss b/src/material-experimental/mdc-radio/_radio-theme.scss index 8deb22c220e1..137ea9b4180c 100644 --- a/src/material-experimental/mdc-radio/_radio-theme.scss +++ b/src/material-experimental/mdc-radio/_radio-theme.scss @@ -4,7 +4,7 @@ @use '@material/radio/radio-theme' as mdc-radio-theme; @use '@material/radio/radio' as mdc-radio; @use '@material/form-field' as mdc-form-field; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin _color-palette($color-palette) { @include mdc-radio-theme.theme(( diff --git a/src/material-experimental/mdc-radio/radio.scss b/src/material-experimental/mdc-radio/radio.scss index 43fefa470d1d..74f91c2394f3 100644 --- a/src/material-experimental/mdc-radio/radio.scss +++ b/src/material-experimental/mdc-radio/radio.scss @@ -7,7 +7,7 @@ @use '@material/touch-target' as mdc-touch-target; @use '@material/ripple' as mdc-ripple; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-radio.static-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-select/BUILD.bazel b/src/material-experimental/mdc-select/BUILD.bazel index 96bfa6368435..7c2374a26ff3 100644 --- a/src/material-experimental/mdc-select/BUILD.bazel +++ b/src/material-experimental/mdc-select/BUILD.bazel @@ -25,8 +25,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -39,7 +39,7 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-select/_select-theme.import.scss b/src/material-experimental/mdc-select/_select-theme.import.scss index e9995285d624..9e2c412f5a47 100644 --- a/src/material-experimental/mdc-select/_select-theme.import.scss +++ b/src/material-experimental/mdc-select/_select-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'select-theme' hide color, density, theme, typography; @forward 'select-theme' as mat-mdc-select-* hide $mat-mdc-select-mdc-select-disabled-dropdown-icon-color, @@ -7,4 +7,4 @@ $mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-drop $mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color, mat-mdc-select-get-mdc-focused-text-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-select/_select-theme.scss b/src/material-experimental/mdc-select/_select-theme.scss index c87293498628..271f547969a1 100644 --- a/src/material-experimental/mdc-select/_select-theme.scss +++ b/src/material-experimental/mdc-select/_select-theme.scss @@ -4,7 +4,7 @@ @use '@material/list/evolution-mixins' as mdc-list; @use '@material/typography' as mdc-typography; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Gets the color to use for some text that is highlighted while a select has focus. @function _get-mdc-focused-text-color($palette) { diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index 9e57202edb7c..bd57ea59edfa 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -38,8 +38,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -52,8 +52,8 @@ sass_binary( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.import.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.import.scss index 7ca758919aed..f00aeb9cdb55 100644 --- a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.import.scss +++ b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'slide-toggle-theme' hide color, density, theme, typography; @forward 'slide-toggle-theme' as mat-mdc-slide-toggle-* hide $mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, @@ -8,4 +8,4 @@ $mat-mdc-slide-toggle-mdc-switch-disabled-track-color, $mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, $mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss index 27f4cb3f4b90..615af5191608 100644 --- a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss +++ b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss @@ -5,7 +5,7 @@ @use '@material/theme/color-palette' as mdc-color-palette; @use '@material/form-field' as mdc-form-field; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; // Generates all color mapping for the properties that only change based on the theme. @function _get-theme-base-map($is-dark) { diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss index 9d8530606795..045c8c06ddb9 100644 --- a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss +++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss @@ -7,7 +7,7 @@ @use '@material/form-field' as mdc-form-field; @use '@material/ripple' as mdc-ripple; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-form-field.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-slider/BUILD.bazel b/src/material-experimental/mdc-slider/BUILD.bazel index 5a98f9ad7619..ef9678e91549 100644 --- a/src/material-experimental/mdc-slider/BUILD.bazel +++ b/src/material-experimental/mdc-slider/BUILD.bazel @@ -37,8 +37,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -49,8 +49,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-slider/_slider-theme.import.scss b/src/material-experimental/mdc-slider/_slider-theme.import.scss index 9f1518982965..d0708a92e3b1 100644 --- a/src/material-experimental/mdc-slider/_slider-theme.import.scss +++ b/src/material-experimental/mdc-slider/_slider-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'slider-theme' as mat-mdc-slider-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-slider/_slider-theme.scss b/src/material-experimental/mdc-slider/_slider-theme.scss index d8715ef12c71..f803f19bdccc 100644 --- a/src/material-experimental/mdc-slider/_slider-theme.scss +++ b/src/material-experimental/mdc-slider/_slider-theme.scss @@ -5,7 +5,7 @@ @use '@material/slider/slider-theme'; @use '@material/theme/variables' as theme-variables; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-slider/slider.scss b/src/material-experimental/mdc-slider/slider.scss index 2362f4df2a36..1e725738695e 100644 --- a/src/material-experimental/mdc-slider/slider.scss +++ b/src/material-experimental/mdc-slider/slider.scss @@ -1,5 +1,5 @@ @use '@material/slider/slider' as mdc-slider; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-slider.without-ripple($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-snack-bar/BUILD.bazel b/src/material-experimental/mdc-snack-bar/BUILD.bazel index d426dd5570d2..adf9f5819d59 100644 --- a/src/material-experimental/mdc-snack-bar/BUILD.bazel +++ b/src/material-experimental/mdc-snack-bar/BUILD.bazel @@ -33,8 +33,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -51,8 +51,8 @@ sass_binary( ], deps = [ "//src/cdk:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.import.scss b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.import.scss index 9286f3fb3f25..43e57074e969 100644 --- a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.import.scss +++ b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.import.scss @@ -1,8 +1,8 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'snack-bar-theme' hide color, density, theme, typography; @forward 'snack-bar-theme' as mat-mdc-snack-bar-* hide $mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, $mat-mdc-snack-bar-mdc-snackbar-label-ink-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss index df75bb07bfd6..baad9b8eda8a 100644 --- a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss +++ b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss @@ -4,7 +4,7 @@ @use 'sass:color'; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-snack-bar/snack-bar-container.scss b/src/material-experimental/mdc-snack-bar/snack-bar-container.scss index 035d34132f60..df89c6a439b4 100644 --- a/src/material-experimental/mdc-snack-bar/snack-bar-container.scss +++ b/src/material-experimental/mdc-snack-bar/snack-bar-container.scss @@ -1,7 +1,7 @@ @use '@angular/cdk'; @use '@material/snackbar' as mdc-snackbar; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { // Include the styles without the animations since we diff --git a/src/material-experimental/mdc-table/BUILD.bazel b/src/material-experimental/mdc-table/BUILD.bazel index f8cd0e17bf93..4dd49dace265 100644 --- a/src/material-experimental/mdc-table/BUILD.bazel +++ b/src/material-experimental/mdc-table/BUILD.bazel @@ -33,8 +33,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -46,8 +46,8 @@ sass_binary( ], deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-table/_table-theme.import.scss b/src/material-experimental/mdc-table/_table-theme.import.scss index 33de7bdfc3d5..8dfef2c30805 100644 --- a/src/material-experimental/mdc-table/_table-theme.import.scss +++ b/src/material-experimental/mdc-table/_table-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'table-theme' hide color, density, theme, typography; @forward 'table-theme' as mat-mdc-table-* hide $mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, @@ -8,4 +8,4 @@ $mat-mdc-table-mdc-data-table-selected-row-fill-color, $mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, $mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-table/_table-theme.scss b/src/material-experimental/mdc-table/_table-theme.scss index bb559ef0cf2b..fd6b9ffa6c29 100644 --- a/src/material-experimental/mdc-table/_table-theme.scss +++ b/src/material-experimental/mdc-table/_table-theme.scss @@ -4,7 +4,7 @@ @use '@material/data-table/data-table' as mdc-data-table; @use '@material/data-table' as mdc-data-table-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-table/table.scss b/src/material-experimental/mdc-table/table.scss index faafd44a9608..7884c9ffb074 100644 --- a/src/material-experimental/mdc-table/table.scss +++ b/src/material-experimental/mdc-table/table.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; @use '@material/data-table/data-table' as mdc-data-table; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @include mdc-helpers.disable-fallback-declarations { @include mdc-data-table.table-styles( diff --git a/src/material-experimental/mdc-tabs/BUILD.bazel b/src/material-experimental/mdc-tabs/BUILD.bazel index 44e69b3551cf..4de4b734213d 100644 --- a/src/material-experimental/mdc-tabs/BUILD.bazel +++ b/src/material-experimental/mdc-tabs/BUILD.bazel @@ -48,8 +48,8 @@ sass_library( deps = [ "//src/cdk:sass_lib", "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-tabs/_tabs-common.import.scss b/src/material-experimental/mdc-tabs/_tabs-common.import.scss index 0ff24e11b276..5c5ed37e767d 100644 --- a/src/material-experimental/mdc-tabs/_tabs-common.import.scss +++ b/src/material-experimental/mdc-tabs/_tabs-common.import.scss @@ -1,6 +1,6 @@ @forward '../../material/core/style/private.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward '../../material/core/style/vendor-prefixes.import'; @forward '../../cdk/a11y/index.import'; @forward 'tabs-common' hide paginated-tab-header, paginated-tab-header-container, @@ -11,4 +11,4 @@ paginated-tab-header-item-wrapper, tab, tab-ripple; @import '../../material/core/style/private'; @import '../../material/core/style/vendor-prefixes'; @import '../../cdk/a11y'; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-tabs/_tabs-common.scss b/src/material-experimental/mdc-tabs/_tabs-common.scss index c11ebcd864f3..d944d8b5ce58 100644 --- a/src/material-experimental/mdc-tabs/_tabs-common.scss +++ b/src/material-experimental/mdc-tabs/_tabs-common.scss @@ -5,7 +5,7 @@ @use '@material/tab-indicator' as mdc-tab-indicator; @use 'sass:map'; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; $mat-tab-animation-duration: 500ms !default; diff --git a/src/material-experimental/mdc-tabs/_tabs-theme.import.scss b/src/material-experimental/mdc-tabs/_tabs-theme.import.scss index 85c530206290..df6ba2758ea1 100644 --- a/src/material-experimental/mdc-tabs/_tabs-theme.import.scss +++ b/src/material-experimental/mdc-tabs/_tabs-theme.import.scss @@ -1,8 +1,8 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'tabs-theme' hide color, density, theme, typography; @forward 'tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default, mat-mdc-tabs-background, mat-mdc-tabs-palette-styles; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-tabs/_tabs-theme.scss b/src/material-experimental/mdc-tabs/_tabs-theme.scss index ae68958ae786..0393a81b0897 100644 --- a/src/material-experimental/mdc-tabs/_tabs-theme.scss +++ b/src/material-experimental/mdc-tabs/_tabs-theme.scss @@ -8,7 +8,7 @@ @use '@material/tab/mixins' as mdc-tab-mixins; @use '@material/tab-bar' as mdc-tab-bar; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-theming/_all-theme.import.scss b/src/material-experimental/mdc-theming/_all-theme.import.scss deleted file mode 100644 index 9f97d8aabef6..000000000000 --- a/src/material-experimental/mdc-theming/_all-theme.import.scss +++ /dev/null @@ -1,116 +0,0 @@ -@forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; -@forward '../../material/core/core.import'; -@forward '../mdc-button/button-theme' hide color, density, theme, typography; -@forward '../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, -mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; -@forward '../mdc-button/button-theme' as mat-mdc-button-* hide -$mat-mdc-button-mat-button-state-target; -@forward '../mdc-button/fab-theme' as mat-mdc-fab-*; -@forward '../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; -@forward '../mdc-card/card-theme' hide color, density, theme, typography; -@forward '../mdc-card/card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, -$mat-mdc-card-mdc-card-outline-color; -@forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, -theme, typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, -$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, -mat-mdc-typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide -$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, -mat-mdc-checkbox-private-checkbox-styles-with-color; -@forward '../mdc-chips/chips-theme' hide color, density, theme, typography; -@forward '../mdc-chips/chips-theme' as mat-mdc-chips-* hide -$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, -$mat-mdc-chips-mdc-chips-ink-color-default; -@forward '../mdc-radio/radio-theme' hide color, density, theme, typography; -@forward '../mdc-radio/radio-theme' as mat-mdc-radio-* hide -$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, -$mat-mdc-radio-mdc-radio-unchecked-color; -@forward '../mdc-select/select-theme' hide color, density, theme, typography; -@forward '../mdc-select/select-theme' as mat-mdc-select-* hide -$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, -$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, -$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; -@forward '../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; -@forward '../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide -$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; -@forward '../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; -@forward '../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide -$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, -$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; -@forward '../mdc-tabs/tabs-theme' hide color, density, theme, typography; -@forward '../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, -$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; -@forward '../mdc-table/table-theme' hide color, density, theme, typography; -@forward '../mdc-table/table-theme' as mat-mdc-table-* hide -$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, -$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, -$mat-mdc-table-mdc-data-table-selected-row-fill-color, -$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, -$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; -@forward '../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; -@forward '../mdc-form-field/form-field-sizing'; -@forward '../mdc-form-field/form-field-native-select' hide private-form-field-native-select, -private-form-field-native-select-color; -@forward '../mdc-form-field/form-field-native-select' as mat-mdc-* hide -$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, -$mat-mdc-mat-form-field-select-horizontal-end-padding; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' hide -private-text-field-refresh-theme-variables; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide -$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, -$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, -$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, -$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, -$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, -$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, -$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, -$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; -@forward '../mdc-core/core-theme.import'; -@forward '../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; -@forward '../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; -@forward '../mdc-list/interactive-list-theme' as mat-mdc-*; -@forward '../mdc-list/list-option-theme' as mat-mdc-*; -@forward '../mdc-list/list-theme' as mat-mdc-list-*; -@forward '../mdc-menu/menu-theme' as mat-mdc-menu-*; -@forward '../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; -@forward '../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; -@forward '../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; -@forward '../mdc-input/input-theme' as mat-mdc-input-*; -@forward '../mdc-form-field/form-field-density' as mat-mdc-*; -@forward '../mdc-form-field/form-field-subscript' as mat-mdc-*; -@forward '../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; -@forward '../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; -@forward 'all-theme' hide all-mdc-component-themes;; - -@import '../mdc-core/core-theme'; -@import '../mdc-autocomplete/autocomplete-theme'; -@import '../mdc-button/button-theme'; -@import '../mdc-card/card-theme'; -@import '../mdc-checkbox/checkbox-theme'; -@import '../mdc-chips/chips-theme'; -@import '../mdc-dialog/dialog-theme'; -@import '../mdc-list/list-theme'; -@import '../mdc-menu/menu-theme'; -@import '../mdc-radio/radio-theme'; -@import '../mdc-select/select-theme'; -@import '../mdc-slide-toggle/slide-toggle-theme'; -@import '../mdc-snack-bar/snack-bar-theme'; -@import '../mdc-tabs/tabs-theme'; -@import '../mdc-table/table-theme'; -@import '../mdc-tooltip/tooltip-theme'; -@import '../mdc-paginator/paginator-theme'; -@import '../mdc-progress-bar/progress-bar-theme'; -@import '../mdc-progress-spinner/progress-spinner-theme'; -@import '../mdc-input/input-theme'; -@import '../mdc-form-field/form-field-theme'; -@import '../../material/core/core'; -@import '../../material/core/core-theme'; -@import '../../material/core/theming/theming'; diff --git a/src/material-experimental/mdc-tooltip/BUILD.bazel b/src/material-experimental/mdc-tooltip/BUILD.bazel index 9fb4f70ca8f8..8158d8d24c48 100644 --- a/src/material-experimental/mdc-tooltip/BUILD.bazel +++ b/src/material-experimental/mdc-tooltip/BUILD.bazel @@ -32,8 +32,8 @@ sass_library( srcs = glob(["**/_*.scss"]), deps = [ "//src/material:sass_lib", - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) @@ -44,8 +44,8 @@ sass_binary( "external/npm/node_modules", ], deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib", ], ) diff --git a/src/material-experimental/mdc-tooltip/_tooltip-theme.import.scss b/src/material-experimental/mdc-tooltip/_tooltip-theme.import.scss index 88efb0f0dfcd..4d9fcb303ac0 100644 --- a/src/material-experimental/mdc-tooltip/_tooltip-theme.import.scss +++ b/src/material-experimental/mdc-tooltip/_tooltip-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; +@forward '../mdc-core/mdc-helpers/mdc-helpers.import'; +@forward '../mdc-core/mdc-helpers/mdc-helpers'; @forward 'tooltip-theme' as mat-mdc-tooltip-*; -@import '../mdc-helpers/mdc-helpers'; +@import '../mdc-core/mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-tooltip/_tooltip-theme.scss b/src/material-experimental/mdc-tooltip/_tooltip-theme.scss index 1fba2418a4de..2d911ab4646b 100644 --- a/src/material-experimental/mdc-tooltip/_tooltip-theme.scss +++ b/src/material-experimental/mdc-tooltip/_tooltip-theme.scss @@ -3,7 +3,7 @@ @use '@material/tooltip/tooltip'; @use '@material/tooltip' as tooltip-theme; -@use '../mdc-helpers/mdc-helpers'; +@use '../mdc-core/mdc-helpers/mdc-helpers'; @mixin color($config-or-theme) { $config: mat.get-color-config($config-or-theme); diff --git a/src/material-experimental/mdc-typography/_all-typography.import.scss b/src/material-experimental/mdc-typography/_all-typography.import.scss deleted file mode 100644 index ae9f9de1ef0f..000000000000 --- a/src/material-experimental/mdc-typography/_all-typography.import.scss +++ /dev/null @@ -1,97 +0,0 @@ -@forward '../../material/core/theming/theming.import'; -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; -@forward '../../material/core/core.import'; -@forward '../mdc-button/button-theme' hide color, density, theme, typography; -@forward '../mdc-button/button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, -mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography; -@forward '../mdc-button/button-theme' as mat-mdc-button-* hide -$mat-mdc-button-mat-button-state-target; -@forward '../mdc-button/fab-theme' as mat-mdc-fab-*; -@forward '../mdc-button/icon-button-theme' as mat-mdc-icon-button-*; -@forward '../mdc-card/card-theme' hide color, density, theme, typography; -@forward '../mdc-card/card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, -$mat-mdc-card-mdc-card-outline-color; -@forward '../mdc-checkbox/checkbox-theme' hide color, density, private-checkbox-styles-with-color, -theme, typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, -$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, -mat-mdc-typography; -@forward '../mdc-checkbox/checkbox-theme' as mat-mdc-checkbox-* hide -$mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, -mat-mdc-checkbox-private-checkbox-styles-with-color; -@forward '../mdc-chips/chips-theme' hide color, density, theme, typography; -@forward '../mdc-chips/chips-theme' as mat-mdc-chips-* hide -$mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, -$mat-mdc-chips-mdc-chips-ink-color-default; -@forward '../mdc-radio/radio-theme' hide color, density, theme, typography; -@forward '../mdc-radio/radio-theme' as mat-mdc-radio-* hide -$mat-mdc-radio-mdc-radio-baseline-theme-color, $mat-mdc-radio-mdc-radio-disabled-circle-color, -$mat-mdc-radio-mdc-radio-unchecked-color; -@forward '../mdc-select/select-theme' hide color, density, theme, typography; -@forward '../mdc-select/select-theme' as mat-mdc-select-* hide -$mat-mdc-select-mdc-select-disabled-dropdown-icon-color, -$mat-mdc-select-mdc-select-disabled-label-color, $mat-mdc-select-mdc-select-dropdown-icon-color, -$mat-mdc-select-mdc-select-ink-color, $mat-mdc-select-mdc-select-label-color; -@forward '../mdc-slide-toggle/slide-toggle-theme' hide color, density, theme, typography; -@forward '../mdc-slide-toggle/slide-toggle-theme' as mat-mdc-slide-toggle-* hide -$mat-mdc-slide-toggle-mdc-switch-baseline-theme-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-disabled-track-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-thumb-color, -$mat-mdc-slide-toggle-mdc-switch-toggled-off-track-color; -@forward '../mdc-snack-bar/snack-bar-theme' hide color, density, theme, typography; -@forward '../mdc-snack-bar/snack-bar-theme' as mat-mdc-snack-bar-* hide -$mat-mdc-snack-bar-mdc-snackbar-dismiss-ink-color, $mat-mdc-snack-bar-mdc-snackbar-fill-color, -$mat-mdc-snack-bar-mdc-snackbar-label-ink-color; -@forward '../mdc-tabs/tabs-theme' hide color, density, theme, typography; -@forward '../mdc-tabs/tabs-theme' as mat-mdc-tabs-* hide $mat-mdc-tabs-mdc-tab-icon-color-active, -$mat-mdc-tabs-mdc-tab-text-label-color-active, $mat-mdc-tabs-mdc-tab-text-label-color-default; -@forward '../mdc-table/table-theme' hide color, density, theme, typography; -@forward '../mdc-table/table-theme' as mat-mdc-table-* hide -$mat-mdc-table-mdc-data-table-divider-color, $mat-mdc-table-mdc-data-table-header-row-text-color, -$mat-mdc-table-mdc-data-table-row-hover-fill-color, $mat-mdc-table-mdc-data-table-row-text-color, -$mat-mdc-table-mdc-data-table-selected-row-fill-color, -$mat-mdc-table-mdc-data-table-sort-icon-active-color, $mat-mdc-table-mdc-data-table-sort-icon-color, -$mat-mdc-table-mdc-data-table-stroke-color, $mat-mdc-table-mdc-data-table-table-divider-color; -@forward '../mdc-paginator/paginator-variables' as mat-mdc-paginator-*; -@forward '../mdc-form-field/form-field-sizing'; -@forward '../mdc-form-field/form-field-native-select' hide private-form-field-native-select, -private-form-field-native-select-color; -@forward '../mdc-form-field/form-field-native-select' as mat-mdc-* hide -$mat-mdc-mat-form-field-select-arrow-height, $mat-mdc-mat-form-field-select-arrow-width, -$mat-mdc-mat-form-field-select-horizontal-end-padding; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' hide -private-text-field-refresh-theme-variables; -@forward '../mdc-form-field/mdc-text-field-theme-variable-refresh' as mat-mdc-* hide -$mat-mdc-mdc-text-field-background, $mat-mdc-mdc-text-field-bottom-line-hover, -$mat-mdc-mdc-text-field-bottom-line-idle, $mat-mdc-mdc-text-field-disabled-background, -$mat-mdc-mdc-text-field-disabled-border, $mat-mdc-mdc-text-field-disabled-border-border, -$mat-mdc-mdc-text-field-disabled-ink-color, $mat-mdc-mdc-text-field-disabled-label-color, -$mat-mdc-mdc-text-field-disabled-placeholder-ink-color, $mat-mdc-mdc-text-field-focused-label-color, -$mat-mdc-mdc-text-field-ink-color, $mat-mdc-mdc-text-field-label, -$mat-mdc-mdc-text-field-outlined-disabled-border, $mat-mdc-mdc-text-field-outlined-hover-border, -$mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholder-ink-color; -@forward '../mdc-core/core-theme.import'; -@forward '../mdc-autocomplete/autocomplete-theme' as mat-mdc-autocomplete-*; -@forward '../mdc-dialog/dialog-theme' as mat-mdc-dialog-*; -@forward '../mdc-list/interactive-list-theme' as mat-mdc-*; -@forward '../mdc-list/list-option-theme' as mat-mdc-*; -@forward '../mdc-list/list-theme' as mat-mdc-list-*; -@forward '../mdc-menu/menu-theme' as mat-mdc-menu-*; -@forward '../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*; -@forward '../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; -@forward '../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; -@forward '../mdc-input/input-theme' as mat-mdc-input-*; -@forward '../mdc-form-field/form-field-density' as mat-mdc-*; -@forward '../mdc-form-field/form-field-subscript' as mat-mdc-*; -@forward '../mdc-form-field/form-field-focus-overlay' as mat-mdc-*; -@forward '../mdc-form-field/form-field-theme' as mat-mdc-form-field-*; -@forward '../mdc-theming/all-theme'; -@forward 'all-typography' hide define-mdc-typography-config, all-mdc-component-typographies; -@forward 'all-typography' as mat-mdc-typography-* hide -mat-mdc-typography-all-mdc-component-typographies, mat-mdc-typography-define-mdc-typography-config, -mat-mdc-typography-mat-mdc-typography-config; - -@import '../mdc-theming/all-theme'; diff --git a/src/material-experimental/package-base.json b/src/material-experimental/package-base.json index ab294fd66dd2..0e6e2f0d7eaa 100644 --- a/src/material-experimental/package-base.json +++ b/src/material-experimental/package-base.json @@ -15,20 +15,20 @@ ".": { "sass": "./_index.scss" }, - "./mdc-theming/prebuilt/indigo-pink.css": { - "style": "./mdc-theming/prebuilt/indigo-pink.css" + "./mdc-core/theming/prebuilt/indigo-pink.css": { + "style": "./mdc-core/theming/prebuilt/indigo-pink.css" }, - "./mdc-theming/prebuilt/deeppurple-amber.css": { - "style": "./mdc-theming/prebuilt/deeppurple-amber.css" + "./mdc-core/theming/prebuilt/deeppurple-amber.css": { + "style": "./mdc-core/theming/prebuilt/deeppurple-amber.css" }, - "./mdc-theming/prebuilt/pink-bluegrey.css": { - "style": "./mdc-theming/prebuilt/pink-bluegrey.css" + "./mdc-core/theming/prebuilt/pink-bluegrey.css": { + "style": "./mdc-core/theming/prebuilt/pink-bluegrey.css" }, - "./mdc-theming/prebuilt/purple-green.css": { - "style": "./mdc-theming/prebuilt/purple-green.css" + "./mdc-core/theming/prebuilt/purple-green.css": { + "style": "./mdc-core/theming/prebuilt/purple-green.css" }, - "./mdc-theming/prebuilt/*": { - "style": "./mdc-theming/prebuilt/*.css" + "./mdc-core/theming/prebuilt/*": { + "style": "./mdc-core/theming/prebuilt/*.css" } }, "peerDependencies": { diff --git a/test/benchmarks/mdc/button/BUILD.bazel b/test/benchmarks/mdc/button/BUILD.bazel index f6d921870901..9f3f113e2a9c 100644 --- a/test/benchmarks/mdc/button/BUILD.bazel +++ b/test/benchmarks/mdc/button/BUILD.bazel @@ -18,5 +18,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/button/app.module.ts b/test/benchmarks/mdc/button/app.module.ts index 9296c04630ba..38016074e92d 100644 --- a/test/benchmarks/mdc/button/app.module.ts +++ b/test/benchmarks/mdc/button/app.module.ts @@ -20,7 +20,7 @@ import {MatButtonModule} from '@angular/material-experimental/mdc-button'; `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class ButtonBenchmarkApp { isChecked = false; diff --git a/test/benchmarks/mdc/card/BUILD.bazel b/test/benchmarks/mdc/card/BUILD.bazel index b70784c356c6..a5b9745646f8 100644 --- a/test/benchmarks/mdc/card/BUILD.bazel +++ b/test/benchmarks/mdc/card/BUILD.bazel @@ -18,5 +18,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/card/app.module.ts b/test/benchmarks/mdc/card/app.module.ts index 57ec31535cae..1a500e456ad1 100644 --- a/test/benchmarks/mdc/card/app.module.ts +++ b/test/benchmarks/mdc/card/app.module.ts @@ -21,7 +21,7 @@ import {MatCardModule} from '@angular/material-experimental/mdc-card'; Simple card `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class CardBenchmarkApp { isVisible = false; diff --git a/test/benchmarks/mdc/checkbox/BUILD.bazel b/test/benchmarks/mdc/checkbox/BUILD.bazel index 9253addee091..ac584a53998c 100644 --- a/test/benchmarks/mdc/checkbox/BUILD.bazel +++ b/test/benchmarks/mdc/checkbox/BUILD.bazel @@ -18,5 +18,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/checkbox/app.module.ts b/test/benchmarks/mdc/checkbox/app.module.ts index 0051345b8aab..7e372cbb0cce 100644 --- a/test/benchmarks/mdc/checkbox/app.module.ts +++ b/test/benchmarks/mdc/checkbox/app.module.ts @@ -26,7 +26,7 @@ import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox'; Check me! `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class CheckboxBenchmarkApp { // isChecked is used to maintain the buttons checked state even after it has been hidden. This is diff --git a/test/benchmarks/mdc/chips/BUILD.bazel b/test/benchmarks/mdc/chips/BUILD.bazel index 66c48c3b117b..b5c86c46bbc0 100644 --- a/test/benchmarks/mdc/chips/BUILD.bazel +++ b/test/benchmarks/mdc/chips/BUILD.bazel @@ -19,5 +19,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/chips/app.module.ts b/test/benchmarks/mdc/chips/app.module.ts index 4ffd1e65eb08..cfa247918373 100644 --- a/test/benchmarks/mdc/chips/app.module.ts +++ b/test/benchmarks/mdc/chips/app.module.ts @@ -16,7 +16,7 @@ import {MatChipsModule} from '@angular/material-experimental/mdc-chips'; selector: 'app-root', templateUrl: './chips.html', encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class ChipsBenchmarkApp { isSingleChipVisible = false; diff --git a/test/benchmarks/mdc/form-field/BUILD.bazel b/test/benchmarks/mdc/form-field/BUILD.bazel index f24bb9f118e7..f69f4cd55abc 100644 --- a/test/benchmarks/mdc/form-field/BUILD.bazel +++ b/test/benchmarks/mdc/form-field/BUILD.bazel @@ -19,5 +19,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/form-field/app.module.ts b/test/benchmarks/mdc/form-field/app.module.ts index 69c5cc5873d9..8a2fdca76439 100644 --- a/test/benchmarks/mdc/form-field/app.module.ts +++ b/test/benchmarks/mdc/form-field/app.module.ts @@ -32,7 +32,7 @@ import {MatInputModule} from '@angular/material-experimental/mdc-input'; `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class FormFieldBenchmarkApp { isInputVisible = false; diff --git a/test/benchmarks/mdc/menu/BUILD.bazel b/test/benchmarks/mdc/menu/BUILD.bazel index 2b89eb81d01c..9ab12dff9d53 100644 --- a/test/benchmarks/mdc/menu/BUILD.bazel +++ b/test/benchmarks/mdc/menu/BUILD.bazel @@ -19,5 +19,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/menu/app.module.ts b/test/benchmarks/mdc/menu/app.module.ts index fad57b9b5ccd..0d815c8a444e 100644 --- a/test/benchmarks/mdc/menu/app.module.ts +++ b/test/benchmarks/mdc/menu/app.module.ts @@ -16,7 +16,7 @@ import {MatMenuModule} from '@angular/material-experimental/mdc-menu'; selector: 'app-root', templateUrl: './menu.html', encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class MenuBenchmarkApp {} diff --git a/test/benchmarks/mdc/radio/BUILD.bazel b/test/benchmarks/mdc/radio/BUILD.bazel index 6000a4645cd7..85d7818231c1 100644 --- a/test/benchmarks/mdc/radio/BUILD.bazel +++ b/test/benchmarks/mdc/radio/BUILD.bazel @@ -18,5 +18,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/radio/app.module.ts b/test/benchmarks/mdc/radio/app.module.ts index d9bc6825fbb4..25f7ecc039e1 100644 --- a/test/benchmarks/mdc/radio/app.module.ts +++ b/test/benchmarks/mdc/radio/app.module.ts @@ -40,7 +40,7 @@ import {MatRadioModule} from '@angular/material-experimental/mdc-radio'; `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class RadioBenchmarkApp { isTwoVisible = false; diff --git a/test/benchmarks/mdc/slide-toggle/BUILD.bazel b/test/benchmarks/mdc/slide-toggle/BUILD.bazel index d5c3b38d9f70..190081c89b46 100644 --- a/test/benchmarks/mdc/slide-toggle/BUILD.bazel +++ b/test/benchmarks/mdc/slide-toggle/BUILD.bazel @@ -18,5 +18,5 @@ component_benchmark( ], ng_srcs = [":app.module.ts"], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/slide-toggle/app.module.ts b/test/benchmarks/mdc/slide-toggle/app.module.ts index 9050ad3e87ac..4131c0737947 100644 --- a/test/benchmarks/mdc/slide-toggle/app.module.ts +++ b/test/benchmarks/mdc/slide-toggle/app.module.ts @@ -23,7 +23,7 @@ import {MatSlideToggleModule} from '@angular/material-experimental/mdc-slide-tog `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class SlideToggleBenchmarkApp { isVisible = false; diff --git a/test/benchmarks/mdc/table/BUILD.bazel b/test/benchmarks/mdc/table/BUILD.bazel index b4a89c9c6dac..b9f4e3e6b2dc 100644 --- a/test/benchmarks/mdc/table/BUILD.bazel +++ b/test/benchmarks/mdc/table/BUILD.bazel @@ -19,5 +19,5 @@ component_benchmark( ":fake-table-data.ts", ], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/table/app.module.ts b/test/benchmarks/mdc/table/app.module.ts index 37bddb6f8e23..8696dc903086 100644 --- a/test/benchmarks/mdc/table/app.module.ts +++ b/test/benchmarks/mdc/table/app.module.ts @@ -25,7 +25,7 @@ import { selector: 'app-root', templateUrl: './app.module.html', encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class TableBenchmarkApp { fiveCols = fiveCols; diff --git a/test/benchmarks/mdc/tabs/BUILD.bazel b/test/benchmarks/mdc/tabs/BUILD.bazel index 0e1862f2fb8e..60ecd329298e 100644 --- a/test/benchmarks/mdc/tabs/BUILD.bazel +++ b/test/benchmarks/mdc/tabs/BUILD.bazel @@ -21,5 +21,5 @@ component_benchmark( "fake-tab-data.ts", ], prefix = "", - styles = ["//src/material-experimental/mdc-theming:indigo_pink_prebuilt"], + styles = ["//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt"], ) diff --git a/test/benchmarks/mdc/tabs/app.module.ts b/test/benchmarks/mdc/tabs/app.module.ts index f96506837f85..9d42c942ecd2 100644 --- a/test/benchmarks/mdc/tabs/app.module.ts +++ b/test/benchmarks/mdc/tabs/app.module.ts @@ -27,7 +27,7 @@ import {threeTabs, tenTabs, twentyTabs} from './fake-tab-data'; ${twentyTabs} `, encapsulation: ViewEncapsulation.None, - styleUrls: ['//src/material-experimental/mdc-theming/prebuilt/indigo-pink.css'], + styleUrls: ['//src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css'], }) export class TabsBenchmarkApp { areThreeTabsVisible = false; diff --git a/test/karma.conf.js b/test/karma.conf.js index c56b65e5f62a..11cc9d44b256 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -57,7 +57,7 @@ module.exports = config => { watched: true, }, { - pattern: 'src/material-experimental/mdc-theming/prebuilt/indigo-pink.css', + pattern: 'src/material-experimental/mdc-core/theming/prebuilt/indigo-pink.css', included: true, watched: true, }, diff --git a/tools/defaults.bzl b/tools/defaults.bzl index d74671c24d8c..77d3acc9f8de 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -385,7 +385,7 @@ def ng_web_test_suite(deps = [], static_css = [], exclude_init_script = False, * # prebuilt theme will be also added to CDK test suites but shouldn't affect anything. static_css = static_css + [ "//src/material/prebuilt-themes:indigo-pink", - "//src/material-experimental/mdc-theming:indigo_pink_prebuilt", + "//src/material-experimental/mdc-core/theming:indigo_pink_prebuilt", ] # Workaround for https://github.com/bazelbuild/rules_typescript/issues/301