From ee2558cd2bc57e8d3d4ca75a835ad299d99d5f41 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Mon, 29 Mar 2021 19:19:21 +0200 Subject: [PATCH] refactor(cdk/overlay): use index files for public Sass API instead of copying files out Currently we copy out a few of the CDK .scss files to the root of the `cdk` package so that they're more convenient to consume. The problem with this is that it prevents us from importing other Sass files, because the import path will be wrong after the files are copied (see #22043). These changes rename the files to `_index.scss` which will allow users to maintain the same import paths while allowing us to remove the file copying logic and not having to worry about import paths. BREAKING CHANGES: Deep imports to the following CDK .scss files need to be updated: * `@import '~@angular/cdk/overlay/overlay'` -> `@import ~@angular/cdk/overlay` * `@import '~@angular/cdk/a11y/a11y'` -> `@import ~@angular/cdk/a11y` * `@import '~@angular/cdk/text-field/text-field'` -> `@import ~@angular/cdk/text-field` --- src/cdk/BUILD.bazel | 22 ++++++------------- src/cdk/_index.scss | 6 ++--- src/cdk/a11y/_a11y.import.scss | 2 -- src/cdk/a11y/_index.import.scss | 2 ++ src/cdk/a11y/{_a11y.scss => _index.scss} | 0 src/cdk/a11y/a11y-prebuilt.scss | 2 +- ...deprecated.scss => _index-deprecated.scss} | 2 +- src/cdk/overlay/_index.import.scss | 13 +++++++++++ .../overlay/{_overlay.scss => _index.scss} | 0 src/cdk/overlay/_overlay.import.scss | 13 ----------- src/cdk/overlay/overlay-prebuilt.scss | 2 +- src/cdk/text-field/_index.import.scss | 2 ++ .../{_text-field.scss => _index.scss} | 0 src/cdk/text-field/_text-field.import.scss | 2 -- src/cdk/text-field/text-field-prebuilt.scss | 2 +- src/dev-app/input/input-demo.scss | 2 +- src/dev-app/mdc-input/mdc-input-demo.scss | 2 +- .../mdc-autocomplete/autocomplete.scss | 2 +- .../mdc-button/button.scss | 2 +- .../mdc-checkbox/checkbox.scss | 2 +- .../mdc-chips/chips.scss | 2 +- .../mdc-core/option/option.scss | 2 +- .../mdc-dialog/dialog.scss | 2 +- .../_form-field-native-select.import.scss | 4 ++-- .../_form-field-native-select.scss | 2 +- .../_form-field-theme.import.scss | 2 +- ...text-field-structure-overrides.import.scss | 4 ++-- .../_mdc-text-field-structure-overrides.scss | 2 +- src/material-experimental/mdc-menu/menu.scss | 2 +- .../mdc-paginator/paginator.scss | 2 +- .../mdc-radio/radio.scss | 2 +- .../mdc-select/select.scss | 2 +- .../mdc-slide-toggle/slide-toggle.scss | 2 +- .../mdc-slider/slider.scss | 2 +- .../mdc-snack-bar/snack-bar-container.scss | 2 +- .../mdc-tabs/_tabs-common.import.scss | 4 ++-- .../mdc-tabs/_tabs-common.scss | 2 +- .../popover-edit/_popover-edit-theme.scss | 2 +- .../popover-edit/_popover-edit.import.scss | 4 ++-- src/material/autocomplete/autocomplete.scss | 2 +- src/material/badge/_badge-theme.import.scss | 4 ++-- src/material/badge/_badge-theme.scss | 2 +- .../bottom-sheet/bottom-sheet-container.scss | 2 +- .../_button-toggle-theme.import.scss | 4 ++-- .../button-toggle/_button-toggle-theme.scss | 2 +- src/material/button-toggle/button-toggle.scss | 2 +- src/material/button/button.scss | 2 +- src/material/card/card.scss | 2 +- src/material/checkbox/checkbox.scss | 2 +- src/material/chips/chips.scss | 2 +- src/material/core/_core.import.scss | 10 ++++----- src/material/core/_core.scss | 6 ++--- .../core/color/_all-color.import.scss | 4 ++-- src/material/core/option/option.scss | 2 +- src/material/core/ripple/_ripple.import.scss | 4 ++-- src/material/core/ripple/_ripple.scss | 2 +- .../core/theming/_all-theme.import.scss | 4 ++-- src/material/datepicker/calendar-body.scss | 2 +- src/material/dialog/dialog.scss | 2 +- .../expansion/expansion-panel-header.scss | 2 +- src/material/expansion/expansion-panel.scss | 2 +- src/material/form-field/form-field-fill.scss | 2 +- src/material/form-field/form-field-input.scss | 2 +- .../form-field/form-field-legacy.scss | 2 +- .../form-field/form-field-standard.scss | 2 +- src/material/form-field/form-field.scss | 2 +- src/material/list/list.scss | 2 +- src/material/menu/menu.scss | 2 +- src/material/progress-bar/progress-bar.scss | 2 +- .../progress-spinner/progress-spinner.scss | 2 +- src/material/radio/radio.scss | 2 +- src/material/select/select.scss | 2 +- src/material/sidenav/drawer.scss | 2 +- src/material/slide-toggle/slide-toggle.scss | 2 +- src/material/slider/slider.scss | 2 +- .../snack-bar/snack-bar-container.scss | 2 +- src/material/sort/sort-header.scss | 2 +- src/material/tabs/_tabs-common.import.scss | 4 ++-- src/material/tabs/_tabs-common.scss | 2 +- src/material/toolbar/toolbar.scss | 2 +- src/material/tooltip/tooltip.scss | 2 +- 81 files changed, 113 insertions(+), 121 deletions(-) delete mode 100644 src/cdk/a11y/_a11y.import.scss create mode 100644 src/cdk/a11y/_index.import.scss rename src/cdk/a11y/{_a11y.scss => _index.scss} (100%) rename src/cdk/overlay/{_overlay-deprecated.scss => _index-deprecated.scss} (95%) create mode 100644 src/cdk/overlay/_index.import.scss rename src/cdk/overlay/{_overlay.scss => _index.scss} (100%) delete mode 100644 src/cdk/overlay/_overlay.import.scss create mode 100644 src/cdk/text-field/_index.import.scss rename src/cdk/text-field/{_text-field.scss => _index.scss} (100%) delete mode 100644 src/cdk/text-field/_text-field.import.scss diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel index f4681205e511..235a7d7d647f 100644 --- a/src/cdk/BUILD.bazel +++ b/src/cdk/BUILD.bazel @@ -17,37 +17,29 @@ ts_library( # to make it easier for developers to import these styles without needing to know about # deep imports in the release output. Note that this is done for backwards compatibility # with the Gulp release output. TODO(devversion): consider removing this in the future. -rerootedStyles = [file for target in CDK_ENTRYPOINTS_WITH_STYLES for file in [ - [ - "_%s.scss" % target, - target, - ], - [ - "_%s.import.scss" % target, - target, - ], +prebuiltStyles = [file for target in CDK_ENTRYPOINTS_WITH_STYLES for file in [ [ "%s-prebuilt.css" % target, target, ], ]] -# Create genrules which re-root stylesheets from secondary entry-points. +# Create genrules that output prebuilt stylesheets for secondary entry-points with styles. [genrule( - name = "%s_rerooted" % file, + name = "%s_prebuilt" % file, srcs = ["//src/cdk/%s:%s" % (target, file)], outs = [file], cmd = "cp $< $@", ) for [ file, target, -] in rerootedStyles] +] in prebuiltStyles] # List of targets which generate the re-rooted stylesheet files. -rerootedStyleTargets = ["%s_rerooted" % file for [ +prebuiltStyleTargets = ["%s_prebuilt" % file for [ file, _, -] in rerootedStyles] +] in prebuiltStyles] # Makes the public Sass API bundle available in the release output as `angular/cdk`. sass_library( @@ -59,7 +51,7 @@ sass_library( ng_package( name = "npm_package", srcs = ["package.json"], - data = [":sass_index"] + rerootedStyleTargets + CDK_SCSS_LIBS, + data = [":sass_index"] + prebuiltStyleTargets + CDK_SCSS_LIBS, entry_point = ":public-api.ts", nested_packages = [ "//src/cdk/schematics:npm_package", diff --git a/src/cdk/_index.scss b/src/cdk/_index.scss index deb63dcc1f3b..2194c810ac95 100644 --- a/src/cdk/_index.scss +++ b/src/cdk/_index.scss @@ -1,7 +1,7 @@ -@forward './overlay/overlay' show overlay, $overlay-container-z-index, $overlay-z-index, +@forward './overlay' show overlay, $overlay-container-z-index, $overlay-z-index, $overlay-backdrop-z-index, $overlay-backdrop-color; -@forward './a11y/a11y' show a11y-visually-hidden, high-contrast; -@forward './text-field/text-field' show text-field-autosize, text-field-autofill, +@forward './a11y' show a11y-visually-hidden, high-contrast; +@forward './text-field' show text-field-autosize, text-field-autofill, text-field-autofill-color, // `text-field` is deprecated, but we have to export it // here in order for the theming API schematic to work. diff --git a/src/cdk/a11y/_a11y.import.scss b/src/cdk/a11y/_a11y.import.scss deleted file mode 100644 index 957c7bf1fcae..000000000000 --- a/src/cdk/a11y/_a11y.import.scss +++ /dev/null @@ -1,2 +0,0 @@ -@forward 'a11y' hide a11y, high-contrast; -@forward 'a11y' as cdk-* hide cdk-optionally-nest-content; diff --git a/src/cdk/a11y/_index.import.scss b/src/cdk/a11y/_index.import.scss new file mode 100644 index 000000000000..f534860b10f3 --- /dev/null +++ b/src/cdk/a11y/_index.import.scss @@ -0,0 +1,2 @@ +@forward 'index' hide a11y, high-contrast; +@forward 'index' as cdk-* hide cdk-optionally-nest-content; diff --git a/src/cdk/a11y/_a11y.scss b/src/cdk/a11y/_index.scss similarity index 100% rename from src/cdk/a11y/_a11y.scss rename to src/cdk/a11y/_index.scss diff --git a/src/cdk/a11y/a11y-prebuilt.scss b/src/cdk/a11y/a11y-prebuilt.scss index f39d12d161fa..869cd33db75b 100644 --- a/src/cdk/a11y/a11y-prebuilt.scss +++ b/src/cdk/a11y/a11y-prebuilt.scss @@ -1,3 +1,3 @@ -@use './a11y'; +@use './index' as a11y; @include a11y.a11y-visually-hidden(); diff --git a/src/cdk/overlay/_overlay-deprecated.scss b/src/cdk/overlay/_index-deprecated.scss similarity index 95% rename from src/cdk/overlay/_overlay-deprecated.scss rename to src/cdk/overlay/_index-deprecated.scss index 0208d1f4842b..d2c96ba771fc 100644 --- a/src/cdk/overlay/_overlay-deprecated.scss +++ b/src/cdk/overlay/_index-deprecated.scss @@ -1,4 +1,4 @@ -@use './overlay'; +@use './index'; // @deprecated Use `$overlay-container-z-index`. $z-index-overlay-container: overlay.$overlay-container-z-index; diff --git a/src/cdk/overlay/_index.import.scss b/src/cdk/overlay/_index.import.scss new file mode 100644 index 000000000000..042a7fb84c1f --- /dev/null +++ b/src/cdk/overlay/_index.import.scss @@ -0,0 +1,13 @@ +@forward '../a11y' as cdk-*; +@forward 'index' hide $dark-backdrop-background, $z-index-overlay, $z-index-overlay-backdrop, + $z-index-overlay-container, overlay; +@forward 'index' as cdk-* hide $cdk-backdrop-animation-duration, + $cdk-backdrop-animation-timing-function, $cdk-dark-backdrop-background; +@forward 'index' as cdk-overlay-* hide $cdk-overlay-backdrop-animation-duration, + $cdk-overlay-backdrop-animation-timing-function, $cdk-overlay-z-index-overlay, + $cdk-overlay-z-index-overlay-backdrop, $cdk-overlay-z-index-overlay-container, + cdk-overlay-overlay; +@forward './index-deprecated' as cdk-*; +@forward './index-deprecated' as cdk-overlay-*; + +@import '../a11y'; diff --git a/src/cdk/overlay/_overlay.scss b/src/cdk/overlay/_index.scss similarity index 100% rename from src/cdk/overlay/_overlay.scss rename to src/cdk/overlay/_index.scss diff --git a/src/cdk/overlay/_overlay.import.scss b/src/cdk/overlay/_overlay.import.scss deleted file mode 100644 index 92c67f9ccfc8..000000000000 --- a/src/cdk/overlay/_overlay.import.scss +++ /dev/null @@ -1,13 +0,0 @@ -@forward '../a11y/a11y' as cdk-*; -@forward 'overlay' hide $overlay-backdrop-color, $overlay-z-index, $overlay-backdrop-z-index, - $overlay-container-z-index, overlay; -@forward 'overlay' as cdk-* hide $cdk-backdrop-animation-duration, - $cdk-backdrop-animation-timing-function, $cdk-overlay-backdrop-color; -@forward 'overlay' as cdk-overlay-* hide $cdk-overlay-backdrop-animation-duration, - $cdk-overlay-backdrop-animation-timing-function, $cdk-overlay-overlay-z-index, - $cdk-overlay-overlay-backdrop-z-index, $cdk-overlay-overlay-container-z-index, - cdk-overlay-overlay; -@forward './overlay-deprecated' as cdk-*; -@forward './overlay-deprecated' as cdk-overlay-*; - -@import '../a11y/a11y'; diff --git a/src/cdk/overlay/overlay-prebuilt.scss b/src/cdk/overlay/overlay-prebuilt.scss index 66a188416384..d9e1a58d0576 100644 --- a/src/cdk/overlay/overlay-prebuilt.scss +++ b/src/cdk/overlay/overlay-prebuilt.scss @@ -1,3 +1,3 @@ -@use './overlay'; +@use './index' as overlay; @include overlay.overlay(); diff --git a/src/cdk/text-field/_index.import.scss b/src/cdk/text-field/_index.import.scss new file mode 100644 index 000000000000..9a4c2158d021 --- /dev/null +++ b/src/cdk/text-field/_index.import.scss @@ -0,0 +1,2 @@ +@forward 'index' as cdk-* show cdk-text-field-autofill, cdk-text-field-autofill-color, +cdk-text-field-autosize, cdk-text-field; diff --git a/src/cdk/text-field/_text-field.scss b/src/cdk/text-field/_index.scss similarity index 100% rename from src/cdk/text-field/_text-field.scss rename to src/cdk/text-field/_index.scss diff --git a/src/cdk/text-field/_text-field.import.scss b/src/cdk/text-field/_text-field.import.scss deleted file mode 100644 index 2104eb91048b..000000000000 --- a/src/cdk/text-field/_text-field.import.scss +++ /dev/null @@ -1,2 +0,0 @@ -@forward 'text-field' as cdk-* show cdk-text-field-autofill, cdk-text-field-autofill-color, -cdk-text-field-autosize, cdk-text-field; diff --git a/src/cdk/text-field/text-field-prebuilt.scss b/src/cdk/text-field/text-field-prebuilt.scss index 08c0400ca273..c09e2513c28b 100644 --- a/src/cdk/text-field/text-field-prebuilt.scss +++ b/src/cdk/text-field/text-field-prebuilt.scss @@ -1,4 +1,4 @@ -@use 'text-field'; +@use 'index' as text-field; @include text-field.text-field-autosize(); @include text-field.text-field-autofill(); diff --git a/src/dev-app/input/input-demo.scss b/src/dev-app/input/input-demo.scss index 3856a6f73c0f..85c883671d24 100644 --- a/src/dev-app/input/input-demo.scss +++ b/src/dev-app/input/input-demo.scss @@ -1,4 +1,4 @@ -@use '../../cdk/text-field/text-field'; +@use '../../cdk/text-field'; .demo-basic { padding: 0; diff --git a/src/dev-app/mdc-input/mdc-input-demo.scss b/src/dev-app/mdc-input/mdc-input-demo.scss index 97781425e92a..7c0d9cdb4724 100644 --- a/src/dev-app/mdc-input/mdc-input-demo.scss +++ b/src/dev-app/mdc-input/mdc-input-demo.scss @@ -1,4 +1,4 @@ -@use '../../cdk/text-field/text-field'; +@use '../../cdk/text-field'; .demo-basic { padding: 0; diff --git a/src/material-experimental/mdc-autocomplete/autocomplete.scss b/src/material-experimental/mdc-autocomplete/autocomplete.scss index b3311d833c32..a512daff86d0 100644 --- a/src/material-experimental/mdc-autocomplete/autocomplete.scss +++ b/src/material-experimental/mdc-autocomplete/autocomplete.scss @@ -1,6 +1,6 @@ @use '@material/menu-surface/mixins' as mdc-menu-surface; @use '@material/list/mixins' as mdc-list; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../mdc-helpers/mdc-helpers'; @include mdc-menu-surface.core-styles($query: structure); diff --git a/src/material-experimental/mdc-button/button.scss b/src/material-experimental/mdc-button/button.scss index dcea32a27233..1ca09d997b9c 100644 --- a/src/material-experimental/mdc-button/button.scss +++ b/src/material-experimental/mdc-button/button.scss @@ -1,7 +1,7 @@ @use '@material/button/button' as mdc-button; @use '@material/button/variables' as mdc-button-variables; @use '../mdc-helpers/mdc-helpers'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '_button-base'; diff --git a/src/material-experimental/mdc-checkbox/checkbox.scss b/src/material-experimental/mdc-checkbox/checkbox.scss index 03c0cb562726..4ec0c2852293 100644 --- a/src/material-experimental/mdc-checkbox/checkbox.scss +++ b/src/material-experimental/mdc-checkbox/checkbox.scss @@ -3,7 +3,7 @@ @use '@material/form-field' as mdc-form-field; @use '@material/ripple' as mdc-ripple; @use 'sass:map'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../mdc-helpers/mdc-helpers'; @use '../../material/core/style/_layout-common.scss'; diff --git a/src/material-experimental/mdc-chips/chips.scss b/src/material-experimental/mdc-chips/chips.scss index aff45db20118..610dd845588c 100644 --- a/src/material-experimental/mdc-chips/chips.scss +++ b/src/material-experimental/mdc-chips/chips.scss @@ -1,7 +1,7 @@ @use '@material/chips/deprecated' as mdc-chips; @use '@material/ripple' as mdc-ripple; @use '../../material/core/style/layout-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../mdc-helpers/mdc-helpers'; @include mdc-chips.without-ripple($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-core/option/option.scss b/src/material-experimental/mdc-core/option/option.scss index 5d0f2e177d29..59bb0fd8fa30 100644 --- a/src/material-experimental/mdc-core/option/option.scss +++ b/src/material-experimental/mdc-core/option/option.scss @@ -2,7 +2,7 @@ @use 'sass:map'; @use '../../mdc-helpers/mdc-helpers'; @use '../../../material/core/style/vendor-prefixes'; -@use '../../../cdk/a11y/a11y'; +@use '../../../cdk/a11y'; @use '../../../material/core/style/layout-common'; .mat-mdc-option { diff --git a/src/material-experimental/mdc-dialog/dialog.scss b/src/material-experimental/mdc-dialog/dialog.scss index 2d17397ef586..4ee775525673 100644 --- a/src/material-experimental/mdc-dialog/dialog.scss +++ b/src/material-experimental/mdc-dialog/dialog.scss @@ -1,7 +1,7 @@ @use '@material/dialog' as mdc-dialog; @use '../mdc-helpers/mdc-helpers'; @use './mdc-dialog-structure-overrides'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Dialog content max height. This has been copied from the standard dialog // and is needed to make the dialog content scrollable. diff --git a/src/material-experimental/mdc-form-field/_form-field-native-select.import.scss b/src/material-experimental/mdc-form-field/_form-field-native-select.import.scss index 5fd7b32c1a65..958f2ad9ec0f 100644 --- a/src/material-experimental/mdc-form-field/_form-field-native-select.import.scss +++ b/src/material-experimental/mdc-form-field/_form-field-native-select.import.scss @@ -1,9 +1,9 @@ @forward '../../material/core/theming/theming.import'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward 'form-field-native-select' hide private-form-field-native-select, private-form-field-native-select-color; @forward '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; @import '../../material/core/theming/theming'; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; 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 c3b0773cde31..ed53441e9fb5 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 @@ -1,6 +1,6 @@ @use 'sass:map'; @use '../../material/core/theming/theming'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../../material/core/theming/palette'; // Width of the Material Design form-field select arrow. 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 36ffa62f9e2b..08499d4f68c2 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 @@ -20,7 +20,7 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward 'form-field-density' as mat-mdc-*; @forward 'form-field-subscript' as mat-mdc-*; @forward 'form-field-focus-overlay' as mat-mdc-*; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @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; diff --git a/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.import.scss b/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.import.scss index 0a3f7fd5b6ea..7eeff9dc1113 100644 --- a/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.import.scss +++ b/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.import.scss @@ -1,6 +1,6 @@ @forward 'form-field-sizing'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward 'mdc-text-field-structure-overrides' as mat-mdc-*; @import 'form-field-sizing'; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; diff --git a/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss b/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss index f97d117d950c..793cf6cbeac1 100644 --- a/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss +++ b/src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss @@ -1,5 +1,5 @@ @use 'form-field-sizing'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Mixin that can be included to override the default MDC text-field // styles to fit our needs. See individual comments for context on why diff --git a/src/material-experimental/mdc-menu/menu.scss b/src/material-experimental/mdc-menu/menu.scss index 6132fabc54b6..d52d2093a41a 100644 --- a/src/material-experimental/mdc-menu/menu.scss +++ b/src/material-experimental/mdc-menu/menu.scss @@ -3,7 +3,7 @@ @use '@material/list' as mdc-list; @use '../../material/core/style/menu-common'; @use '../../material/core/style/button-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../mdc-helpers/mdc-helpers'; @include mdc-menu-surface.core-styles($query: structure); diff --git a/src/material-experimental/mdc-paginator/paginator.scss b/src/material-experimental/mdc-paginator/paginator.scss index ec35f7340896..9d427627f21b 100644 --- a/src/material-experimental/mdc-paginator/paginator.scss +++ b/src/material-experimental/mdc-paginator/paginator.scss @@ -1,5 +1,5 @@ @use '../mdc-form-field/form-field-theme'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $padding: 0 8px; $page-size-margin-right: 8px; diff --git a/src/material-experimental/mdc-radio/radio.scss b/src/material-experimental/mdc-radio/radio.scss index 59e6282abeae..7e7413d4dfda 100644 --- a/src/material-experimental/mdc-radio/radio.scss +++ b/src/material-experimental/mdc-radio/radio.scss @@ -2,7 +2,7 @@ @use '@material/radio/radio-theme' as mdc-radio-theme; @use '@material/form-field' as mdc-form-field; @use '../mdc-helpers/mdc-helpers'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../../material/core/style/layout-common'; @include mdc-radio.without-ripple($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-select/select.scss b/src/material-experimental/mdc-select/select.scss index 74e59e0a97b1..9778dbeb8fe9 100644 --- a/src/material-experimental/mdc-select/select.scss +++ b/src/material-experimental/mdc-select/select.scss @@ -2,7 +2,7 @@ @use '@material/list' as mdc-list; @use '../../material/core/style/variables'; @use '../../material/core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $mat-select-arrow-size: 5px !default; $mat-select-arrow-margin: 4px !default; diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss index dfd440010769..26cf8d7676d2 100644 --- a/src/material-experimental/mdc-slide-toggle/slide-toggle.scss +++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.scss @@ -4,7 +4,7 @@ @use 'sass:map'; @use '../mdc-helpers/mdc-helpers'; @use '../../material/core/style/layout-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @include mdc-switch.without-ripple($query: mdc-helpers.$mat-base-styles-query); @include mdc-form-field.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-slider/slider.scss b/src/material-experimental/mdc-slider/slider.scss index c0a689331546..13940da0725a 100644 --- a/src/material-experimental/mdc-slider/slider.scss +++ b/src/material-experimental/mdc-slider/slider.scss @@ -1,7 +1,7 @@ // TODO: disabled until we implement the new MDC slider. // @use '@material/slider' as mdc-slider; @use '../mdc-helpers/mdc-helpers'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $mat-slider-min-size: 128px !default; $mat-slider-horizontal-margin: 8px !default; 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 a5f47efb7791..678f90641e97 100644 --- a/src/material-experimental/mdc-snack-bar/snack-bar-container.scss +++ b/src/material-experimental/mdc-snack-bar/snack-bar-container.scss @@ -1,6 +1,6 @@ @use '@material/snackbar' as mdc-snackbar; @use '../mdc-helpers/mdc-helpers'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @include mdc-snackbar.core-styles($query: mdc-helpers.$mat-base-styles-query); diff --git a/src/material-experimental/mdc-tabs/_tabs-common.import.scss b/src/material-experimental/mdc-tabs/_tabs-common.import.scss index c92ce066c92c..0ff24e11b276 100644 --- a/src/material-experimental/mdc-tabs/_tabs-common.import.scss +++ b/src/material-experimental/mdc-tabs/_tabs-common.import.scss @@ -2,7 +2,7 @@ @forward '../mdc-helpers/mdc-helpers.import'; @forward '../mdc-helpers/mdc-helpers'; @forward '../../material/core/style/vendor-prefixes.import'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward 'tabs-common' hide paginated-tab-header, paginated-tab-header-container, paginated-tab-header-item-wrapper, tab, tab-ripple; @forward 'tabs-common' as mat-mdc-* hide $mat-mdc-mat-tab-animation-duration; @@ -10,5 +10,5 @@ paginated-tab-header-item-wrapper, tab, tab-ripple; @import '../../material/core/style/variables'; @import '../../material/core/style/private'; @import '../../material/core/style/vendor-prefixes'; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; @import '../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 7c0ca2ce4ce5..33523cb3bebe 100644 --- a/src/material-experimental/mdc-tabs/_tabs-common.scss +++ b/src/material-experimental/mdc-tabs/_tabs-common.scss @@ -4,7 +4,7 @@ @use '../../material/core/style/variables'; @use '../../material/core/style/private'; @use '../../material/core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../mdc-helpers/mdc-helpers'; $mat-tab-animation-duration: 500ms !default; diff --git a/src/material-experimental/popover-edit/_popover-edit-theme.scss b/src/material-experimental/popover-edit/_popover-edit-theme.scss index 07995b723358..b012c4fae95c 100644 --- a/src/material-experimental/popover-edit/_popover-edit-theme.scss +++ b/src/material-experimental/popover-edit/_popover-edit-theme.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../../material/core/style/variables'; @use '../../material/core/style/private'; @use '../../material/core/theming/palette'; diff --git a/src/material-experimental/popover-edit/_popover-edit.import.scss b/src/material-experimental/popover-edit/_popover-edit.import.scss index 98211b9d0ca4..f1c842be7fb8 100644 --- a/src/material-experimental/popover-edit/_popover-edit.import.scss +++ b/src/material-experimental/popover-edit/_popover-edit.import.scss @@ -1,11 +1,11 @@ @forward '../../material/core/style/private.import'; @forward '../../material/core/theming/theming.import'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward '../../material/core/typography/typography-utils.import'; @forward 'popover-edit-theme' hide color, density, theme, typography; @forward 'popover-edit-theme' as mat-popover-edit-*; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; @import '../../material/core/style/variables'; @import '../../material/core/style/private'; @import '../../material/core/theming/palette'; diff --git a/src/material/autocomplete/autocomplete.scss b/src/material/autocomplete/autocomplete.scss index 2dd596214d10..c2379f526cb3 100644 --- a/src/material/autocomplete/autocomplete.scss +++ b/src/material/autocomplete/autocomplete.scss @@ -1,5 +1,5 @@ @use '../core/style/menu-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // The max-height of the panel, currently matching mat-select value. $panel-max-height: 256px !default; diff --git a/src/material/badge/_badge-theme.import.scss b/src/material/badge/_badge-theme.import.scss index 96b434e75b2d..653f5925701c 100644 --- a/src/material/badge/_badge-theme.import.scss +++ b/src/material/badge/_badge-theme.import.scss @@ -1,6 +1,6 @@ @forward '../core/theming/theming.import'; @forward '../core/typography/typography-utils.import'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size, color, theme, typography; @forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size; @@ -8,4 +8,4 @@ color, theme, typography; @import '../core/theming/palette'; @import '../core/theming/theming'; @import '../core/typography/typography-utils'; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; diff --git a/src/material/badge/_badge-theme.scss b/src/material/badge/_badge-theme.scss index 6373ab94aa3f..4de31c700d96 100644 --- a/src/material/badge/_badge-theme.scss +++ b/src/material/badge/_badge-theme.scss @@ -8,7 +8,7 @@ @use '../core/theming/theming'; @use '../core/typography/typography'; @use '../core/typography/typography-utils'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $font-size: 12px; $font-weight: 600; diff --git a/src/material/bottom-sheet/bottom-sheet-container.scss b/src/material/bottom-sheet/bottom-sheet-container.scss index d2babf8d3f43..7870a4a7a7bf 100644 --- a/src/material/bottom-sheet/bottom-sheet-container.scss +++ b/src/material/bottom-sheet/bottom-sheet-container.scss @@ -1,4 +1,4 @@ -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // The bottom sheet minimum width on larger screen sizes is based // on increments of the toolbar, according to the spec. See: diff --git a/src/material/button-toggle/_button-toggle-theme.import.scss b/src/material/button-toggle/_button-toggle-theme.import.scss index b04c9989b495..f5c81d68d29c 100644 --- a/src/material/button-toggle/_button-toggle-theme.import.scss +++ b/src/material/button-toggle/_button-toggle-theme.import.scss @@ -2,11 +2,11 @@ @forward '../core/theming/theming.import'; @forward '../core/density/private/compatibility.import'; @forward 'button-toggle-variables' as mat-button-toggle-*; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward '../core/typography/typography-utils.import'; @forward 'button-toggle-theme' as mat-button-toggle-*; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; @import '../core/style/private'; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/button-toggle/_button-toggle-theme.scss b/src/material/button-toggle/_button-toggle-theme.scss index c71e0ed3b681..c00b336569b4 100644 --- a/src/material/button-toggle/_button-toggle-theme.scss +++ b/src/material/button-toggle/_button-toggle-theme.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../core/style/private'; @use '../core/theming/palette'; @use '../core/theming/theming'; diff --git a/src/material/button-toggle/button-toggle.scss b/src/material/button-toggle/button-toggle.scss index 97821ee3ed5e..0756fd4e97cb 100644 --- a/src/material/button-toggle/button-toggle.scss +++ b/src/material/button-toggle/button-toggle.scss @@ -1,6 +1,6 @@ @use '../core/style/vendor-prefixes'; @use '../core/style/layout-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $standard-padding: 0 12px !default; $standard-border-radius: 4px !default; diff --git a/src/material/button/button.scss b/src/material/button/button.scss index d9b5b2e47376..cb5f0e62cf4d 100644 --- a/src/material/button/button.scss +++ b/src/material/button/button.scss @@ -2,7 +2,7 @@ // TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser. @use 'button-base'; @use '../core/style/layout-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; .mat-button, .mat-icon-button { .mat-button-focus-overlay { diff --git a/src/material/card/card.scss b/src/material/card/card.scss index 8c00a62a8f81..150b6e47c2f3 100644 --- a/src/material/card/card.scss +++ b/src/material/card/card.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/style/elevation'; @use '../core/style/private'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $padding: 16px !default; diff --git a/src/material/checkbox/checkbox.scss b/src/material/checkbox/checkbox.scss index 6b4ed62337bb..2f00a894ba74 100644 --- a/src/material/checkbox/checkbox.scss +++ b/src/material/checkbox/checkbox.scss @@ -6,7 +6,7 @@ @use '../core/style/layout-common'; @use '../core/style/vendor-prefixes'; @use '../core/style/private'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use '../core/style/variables'; // Manual calculation done on SVG diff --git a/src/material/chips/chips.scss b/src/material/chips/chips.scss index 779e71f71547..43c735d9d437 100644 --- a/src/material/chips/chips.scss +++ b/src/material/chips/chips.scss @@ -2,7 +2,7 @@ @use '../core/style/elevation'; @use '../core/style/layout-common'; @use '../core/style/private'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $chip-min-height: 32px; $chip-vertical-padding: 7px; diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss index 179bf01d0908..47828eb6d0fe 100644 --- a/src/material/core/_core.import.scss +++ b/src/material/core/_core.import.scss @@ -1,5 +1,5 @@ -@forward '../../cdk/overlay/overlay.import'; -@forward '../../cdk/text-field/text-field.import'; +@forward '../../cdk/overlay/index.import'; +@forward '../../cdk/text-field/index.import'; @forward '../snack-bar/snack-bar-theme.import'; @forward '../tree/tree-theme.import'; @forward 'ripple/ripple.import'; @@ -49,9 +49,9 @@ mat-core-mdc-strong-focus-indicators-positioning; @forward 'core-theme' as mat-core-*; -@import '../../cdk/overlay/overlay'; -@import '../../cdk/a11y/a11y'; -@import '../../cdk/text-field/text-field'; +@import '../../cdk/overlay'; +@import '../../cdk/a11y'; +@import '../../cdk/text-field'; @import './style/private'; @import './ripple/ripple'; @import './focus-indicators/focus-indicators'; diff --git a/src/material/core/_core.scss b/src/material/core/_core.scss index b62097d99ff2..3541c7d033b2 100644 --- a/src/material/core/_core.scss +++ b/src/material/core/_core.scss @@ -1,6 +1,6 @@ -@use '../../cdk/overlay/overlay'; -@use '../../cdk/a11y/a11y'; -@use '../../cdk/text-field/text-field'; +@use '../../cdk/overlay'; +@use '../../cdk/a11y'; +@use '../../cdk/text-field'; // Core styles that can be used to apply material design treatments to any element. @use './ripple/ripple'; diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss index 6141db33e9e0..3a2579da41f9 100644 --- a/src/material/core/color/_all-color.import.scss +++ b/src/material/core/color/_all-color.import.scss @@ -1,5 +1,5 @@ -@forward '../../../cdk/overlay/overlay.import'; -@forward '../../../cdk/text-field/text-field.import'; +@forward '../../../cdk/overlay/index.import'; +@forward '../../../cdk/text-field/index.import'; @forward '../../snack-bar/snack-bar-theme.import'; @forward '../theming/theming.import'; @forward '../ripple/ripple.import'; diff --git a/src/material/core/option/option.scss b/src/material/core/option/option.scss index bea809dfefc7..e1e60c8cfef1 100644 --- a/src/material/core/option/option.scss +++ b/src/material/core/option/option.scss @@ -1,7 +1,7 @@ @use '../style/menu-common'; @use '../style/vendor-prefixes'; @use '../style/layout-common'; -@use '../../../cdk/a11y/a11y'; +@use '../../../cdk/a11y'; .mat-option { @include menu-common.item-base(); diff --git a/src/material/core/ripple/_ripple.import.scss b/src/material/core/ripple/_ripple.import.scss index 97bb232ce025..ee7566d664d2 100644 --- a/src/material/core/ripple/_ripple.import.scss +++ b/src/material/core/ripple/_ripple.import.scss @@ -11,10 +11,10 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi $mat-white-6-opacity, $mat-white-87-opacity; @forward '../density/private/compatibility' as mat-*; @forward '../theming/theming' as mat-*; -@forward '../../../cdk/a11y/a11y.import'; +@forward '../../../cdk/a11y/index.import'; @forward 'ripple' as mat-* hide $mat-color-opacity; @forward 'ripple' as mat-ripple-* hide mat-ripple-ripple; @forward 'ripple-theme' as mat-ripple-*; @import '../theming/theming'; -@import '../../../cdk/a11y/a11y'; +@import '../../../cdk/a11y'; diff --git a/src/material/core/ripple/_ripple.scss b/src/material/core/ripple/_ripple.scss index 4e938a89a883..536f15c826ef 100644 --- a/src/material/core/ripple/_ripple.scss +++ b/src/material/core/ripple/_ripple.scss @@ -1,4 +1,4 @@ -@use '../../../cdk/a11y/a11y'; +@use '../../../cdk/a11y'; @mixin ripple() { // The host element of an mat-ripple directive should always have a position of "absolute" or diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss index 1f1c07c08575..bbf7e7f93643 100644 --- a/src/material/core/theming/_all-theme.import.scss +++ b/src/material/core/theming/_all-theme.import.scss @@ -1,5 +1,5 @@ -@forward '../../../cdk/overlay/overlay.import'; -@forward '../../../cdk/text-field/text-field.import'; +@forward '../../../cdk/overlay/index.import'; +@forward '../../../cdk/text-field/index.import'; @forward '../../snack-bar/snack-bar-theme.import'; @forward 'theming.import'; @forward '../ripple/ripple.import'; diff --git a/src/material/datepicker/calendar-body.scss b/src/material/datepicker/calendar-body.scss index 82c67933e503..d4236eaae907 100644 --- a/src/material/datepicker/calendar-body.scss +++ b/src/material/datepicker/calendar-body.scss @@ -1,4 +1,4 @@ -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $calendar-body-label-padding-start: 5% !default; // We don't want the label to jump around when we switch between month and year views, so we use diff --git a/src/material/dialog/dialog.scss b/src/material/dialog/dialog.scss index ceb962f4dcd8..f5793f93e007 100644 --- a/src/material/dialog/dialog.scss +++ b/src/material/dialog/dialog.scss @@ -1,5 +1,5 @@ @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $padding: 24px !default; diff --git a/src/material/expansion/expansion-panel-header.scss b/src/material/expansion/expansion-panel-header.scss index c95de72aae28..4d348356280d 100644 --- a/src/material/expansion/expansion-panel-header.scss +++ b/src/material/expansion/expansion-panel-header.scss @@ -1,5 +1,5 @@ @use '../core/style/layout-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; @use './expansion-variables'; @use './expansion-mixins'; diff --git a/src/material/expansion/expansion-panel.scss b/src/material/expansion/expansion-panel.scss index 70071956e57a..f8acc40af200 100644 --- a/src/material/expansion/expansion-panel.scss +++ b/src/material/expansion/expansion-panel.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/elevation'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; .mat-expansion-panel { $border-radius: 4px; diff --git a/src/material/form-field/form-field-fill.scss b/src/material/form-field/form-field-fill.scss index 91143d7aeaf3..035f5a2ba879 100644 --- a/src/material/form-field/form-field-fill.scss +++ b/src/material/form-field/form-field-fill.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Styles that only apply to the fill appearance of the form-field. diff --git a/src/material/form-field/form-field-input.scss b/src/material/form-field/form-field-input.scss index 64fbfdace8c7..06d9253acc68 100644 --- a/src/material/form-field/form-field-input.scss +++ b/src/material/form-field/form-field-input.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // The Input element proper. .mat-input-element { diff --git a/src/material/form-field/form-field-legacy.scss b/src/material/form-field/form-field-legacy.scss index 7a317aacfcfd..fa47c9bdeb00 100644 --- a/src/material/form-field/form-field-legacy.scss +++ b/src/material/form-field/form-field-legacy.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Styles that only apply to the legacy appearance of the form-field. diff --git a/src/material/form-field/form-field-standard.scss b/src/material/form-field/form-field-standard.scss index 4b3a75c8ee29..340c28fa5602 100644 --- a/src/material/form-field/form-field-standard.scss +++ b/src/material/form-field/form-field-standard.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Styles that only apply to the standard appearance of the form-field. diff --git a/src/material/form-field/form-field.scss b/src/material/form-field/form-field.scss index 99a5cc8aff23..5545b0380af0 100644 --- a/src/material/form-field/form-field.scss +++ b/src/material/form-field/form-field.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Styles that apply to all appearances of the form-field. diff --git a/src/material/list/list.scss b/src/material/list/list.scss index 478a1295b9c8..046e4b2f9091 100644 --- a/src/material/list/list.scss +++ b/src/material/list/list.scss @@ -2,7 +2,7 @@ @use '../core/style/list-common'; @use '../core/style/layout-common'; @use '../divider/divider-offset'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $side-padding: 16px; diff --git a/src/material/menu/menu.scss b/src/material/menu/menu.scss index a8c086cdd7ab..5f019a8c5216 100644 --- a/src/material/menu/menu.scss +++ b/src/material/menu/menu.scss @@ -1,7 +1,7 @@ // TODO(kara): update vars for desktop when MD team responds @use '../core/style/button-common'; @use '../core/style/menu-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $vertical-padding: 8px !default; $border-radius: 4px !default; diff --git a/src/material/progress-bar/progress-bar.scss b/src/material/progress-bar/progress-bar.scss index 4664fc643d52..d457adeae0d9 100644 --- a/src/material/progress-bar/progress-bar.scss +++ b/src/material/progress-bar/progress-bar.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; @use '../core/style/private'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $height: 4px !default; $full-animation-duration: 2000ms !default; diff --git a/src/material/progress-spinner/progress-spinner.scss b/src/material/progress-spinner/progress-spinner.scss index b476ea264886..6bed35e7f102 100644 --- a/src/material/progress-spinner/progress-spinner.scss +++ b/src/material/progress-spinner/progress-spinner.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/private'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // Animation config diff --git a/src/material/radio/radio.scss b/src/material/radio/radio.scss index 97a05dd9d758..fec9c2014e0e 100644 --- a/src/material/radio/radio.scss +++ b/src/material/radio/radio.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/ripple/ripple'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $size: variables.$toggle-size !default; diff --git a/src/material/select/select.scss b/src/material/select/select.scss index 84aa8a2faf82..402009da9364 100644 --- a/src/material/select/select.scss +++ b/src/material/select/select.scss @@ -2,7 +2,7 @@ @use '../core/style/list-common'; @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $arrow-size: 5px !default; $arrow-margin: 4px !default; diff --git a/src/material/sidenav/drawer.scss b/src/material/sidenav/drawer.scss index 149c4f30f56c..f3ba0ceef90e 100644 --- a/src/material/sidenav/drawer.scss +++ b/src/material/sidenav/drawer.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/style/layout-common'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $drawer-content-z-index: 1; $drawer-side-drawer-z-index: 2; diff --git a/src/material/slide-toggle/slide-toggle.scss b/src/material/slide-toggle/slide-toggle.scss index 9f974647b10c..4f1ddfd6f042 100644 --- a/src/material/slide-toggle/slide-toggle.scss +++ b/src/material/slide-toggle/slide-toggle.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/ripple/ripple'; @use '../core/style/list-common'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $thumb-size: 20px !default; $bar-border-radius: 8px !default; diff --git a/src/material/slider/slider.scss b/src/material/slider/slider.scss index bd7af0659f61..7d1e296c2cb6 100644 --- a/src/material/slider/slider.scss +++ b/src/material/slider/slider.scss @@ -1,6 +1,6 @@ @use '../core/style/variables'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; // This refers to the thickness of the slider. On a horizontal slider this is the height, on a diff --git a/src/material/snack-bar/snack-bar-container.scss b/src/material/snack-bar/snack-bar-container.scss index a2fd099cf4c3..e8cfc313b3ff 100644 --- a/src/material/snack-bar/snack-bar-container.scss +++ b/src/material/snack-bar/snack-bar-container.scss @@ -1,4 +1,4 @@ -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $padding: 14px 16px !default; $min-height: 48px !default; diff --git a/src/material/sort/sort-header.scss b/src/material/sort/sort-header.scss index a98f578947e0..2717d637a2eb 100644 --- a/src/material/sort/sort-header.scss +++ b/src/material/sort/sort-header.scss @@ -1,4 +1,4 @@ -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $header-arrow-margin: 6px; $header-arrow-container-size: 12px; diff --git a/src/material/tabs/_tabs-common.import.scss b/src/material/tabs/_tabs-common.import.scss index 9d6ee54ee58c..71662e338162 100644 --- a/src/material/tabs/_tabs-common.import.scss +++ b/src/material/tabs/_tabs-common.import.scss @@ -1,6 +1,6 @@ @forward '../core/style/private.import'; @forward '../core/style/vendor-prefixes.import'; -@forward '../../cdk/a11y/a11y.import'; +@forward '../../cdk/a11y/index.import'; @forward 'tabs-common' hide $tab-animation-duration, $tab-bar-height; @forward 'tabs-common' as mat-* hide mat-ink-bar, mat-paginated-tab-header, mat-paginated-tab-header-container, mat-paginated-tab-header-item-wrapper, mat-tab-label; @@ -8,4 +8,4 @@ mat-paginated-tab-header-container, mat-paginated-tab-header-item-wrapper, mat-t @import '../core/style/variables'; @import '../core/style/private'; @import '../core/style/vendor-prefixes'; -@import '../../cdk/a11y/a11y'; +@import '../../cdk/a11y'; diff --git a/src/material/tabs/_tabs-common.scss b/src/material/tabs/_tabs-common.scss index 126bb34733b4..e53684cb2633 100644 --- a/src/material/tabs/_tabs-common.scss +++ b/src/material/tabs/_tabs-common.scss @@ -1,7 +1,7 @@ @use '../core/style/variables'; @use '../core/style/private'; @use '../core/style/vendor-prefixes'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $tab-bar-height: 48px !default; $tab-animation-duration: 500ms !default; diff --git a/src/material/toolbar/toolbar.scss b/src/material/toolbar/toolbar.scss index d6a452829a2b..3f15ac692055 100644 --- a/src/material/toolbar/toolbar.scss +++ b/src/material/toolbar/toolbar.scss @@ -1,4 +1,4 @@ -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $row-padding: 16px !default; diff --git a/src/material/tooltip/tooltip.scss b/src/material/tooltip/tooltip.scss index 3fb58cf7bc27..2bdb09fd0ba6 100644 --- a/src/material/tooltip/tooltip.scss +++ b/src/material/tooltip/tooltip.scss @@ -1,5 +1,5 @@ @use '../core/style/variables'; -@use '../../cdk/a11y/a11y'; +@use '../../cdk/a11y'; $horizontal-padding: 8px; $max-width: 250px;