Skip to content

Commit 65a63a3

Browse files
committed
fixup! feat(material/core): move mdc-helpers to material/core
1 parent d57eb96 commit 65a63a3

File tree

17 files changed

+36
-6
lines changed

17 files changed

+36
-6
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/src/material/menu/** @crisbeto
2121
/src/material/paginator/** @andrewseguin
2222
/src/material/prebuilt-themes/** @andrewseguin
23+
/src/material/legacy-prebuilt-themes/** @andrewseguin
2324
/src/material/progress-bar/** @andrewseguin @crisbeto
2425
/src/material/progress-spinner/** @andrewseguin @crisbeto
2526
/src/material/radio/** @andrewseguin @devversion
@@ -51,6 +52,7 @@
5152
/src/material/core/gestures/** @andrewseguin
5253
/src/material/core/label/** @mmalerba
5354
/src/material/core/line/** @andrewseguin
55+
/src/material/core/mdc-helpers/** @mmalerba
5456
/src/material/core/option/** @crisbeto
5557
/src/material/core/placeholder/** @mmalerba
5658
/src/material/core/ripple/** @devversion
@@ -60,6 +62,11 @@
6062
/src/material/core/theming/** @andrewseguin @jelbourn
6163
/src/material/core/typography/** @crisbeto
6264
/src/material/core/util/** @andrewseguin
65+
/src/material/legacy-core/* @andrewseguin
66+
/src/material/legacy-core/color/** @andrewseguin @devversion
67+
/src/material/legacy-core/density/** @devversion
68+
/src/material/legacy-core/theming/** @andrewseguin @jelbourn
69+
/src/material/legacy-core/typography/** @crisbeto
6370

6471
# Miscellaneous components
6572
/src/google-maps/** @crisbeto

src/material-experimental/mdc-card/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ sass_binary(
3838
src = "card.scss",
3939
deps = [
4040
"//:mdc_sass_lib",
41+
"//src/material:sass_lib",
4142
"//src/material/core:core_scss_lib",
4243
],
4344
)

src/material-experimental/mdc-chips/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ sass_binary(
5858
src = "chip-set.scss",
5959
deps = [
6060
"//:mdc_sass_lib",
61+
"//src/material:sass_lib",
6162
"//src/material/core:core_scss_lib",
6263
],
6364
)

src/material-experimental/mdc-core/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ sass_binary(
5151
src = "option/optgroup.scss",
5252
deps = [
5353
"//:mdc_sass_lib",
54+
"//src/material:sass_lib",
5455
"//src/material/core:core_scss_lib",
5556
],
5657
)

src/material-experimental/mdc-dialog/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ sass_binary(
4343
deps = [
4444
":mdc_dialog_scss_lib",
4545
"//:mdc_sass_lib",
46+
"//src/material:sass_lib",
4647
"//src/material/core:core_scss_lib",
4748
],
4849
)

src/material-experimental/mdc-form-field/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ sass_binary(
4646
deps = [
4747
":form_field_partials",
4848
"//:mdc_sass_lib",
49+
"//src/material:sass_lib",
4950
"//src/material/core:core_scss_lib",
5051
],
5152
)

src/material-experimental/mdc-list/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ sass_binary(
6464
":mdc_list_scss_lib",
6565
"//:mdc_sass_lib",
6666
"//src/cdk:sass_lib",
67+
"//src/material:sass_lib",
6768
"//src/material/core:core_scss_lib",
6869
],
6970
)

src/material-experimental/mdc-progress-bar/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ sass_binary(
4242
src = "progress-bar.scss",
4343
deps = [
4444
"//:mdc_sass_lib",
45+
"//src/material:sass_lib",
4546
"//src/material/core:core_scss_lib",
4647
],
4748
)

src/material-experimental/mdc-progress-spinner/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ sass_binary(
4444
src = "progress-spinner.scss",
4545
deps = [
4646
"//:mdc_sass_lib",
47+
"//src/material:sass_lib",
4748
"//src/material/core:core_scss_lib",
4849
],
4950
)

src/material-experimental/mdc-slider/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ sass_binary(
4747
src = "slider.scss",
4848
deps = [
4949
"//:mdc_sass_lib",
50+
"//src/material:sass_lib",
5051
"//src/material/core:core_scss_lib",
5152
],
5253
)

src/material-experimental/mdc-snack-bar/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ sass_binary(
4949
deps = [
5050
"//:mdc_sass_lib",
5151
"//src/cdk:sass_lib",
52+
"//src/material:sass_lib",
5253
"//src/material/core:core_scss_lib",
5354
],
5455
)

src/material-experimental/mdc-tabs/BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ sass_binary(
8484
sass_binary(
8585
name = "mdc_tab_link_scss",
8686
src = "tab-nav-bar/tab-link.scss",
87-
deps = [":mdc_tabs_scss_lib"],
87+
deps = [
88+
":mdc_tabs_scss_lib",
89+
"//src/material:sass_lib",
90+
],
8891
)
8992

9093
ng_test_library(

src/material/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ sass_library(
2929
"//src/material/core:core_scss_lib",
3030
"//src/material/core:theming_scss_lib",
3131
"//src/material/legacy-core:legacy_core_scss_lib",
32+
"//src/material/legacy-core:theming_scss_lib",
3233
],
3334
)
3435

src/material/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
// Private/Internal
1818
@forward './core/density/private/all-density' as private-* show private-all-component-densities;
19-
@forward './legacy-core/density/private/all-density' as private-* show private-all-legacy-component-densities;
19+
@forward './legacy-core/density/private/all-density' as private-* show
20+
private-all-legacy-component-densities;
2021
@forward './core/theming/theming' show private-check-duplicate-theme-styles,
2122
private-legacy-get-theme, private-is-theme-object;
2223
@forward './core/style/layout-common' as private-* show private-fill;

src/material/core/theming/tests/BUILD.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ sass_binary(
88
name = "test-css-variables-theme",
99
testonly = True,
1010
src = "test-css-variables-theme.scss",
11-
deps = ["//src/material/core:theming_scss_lib"],
11+
deps = [
12+
"//src/material/core:theming_scss_lib",
13+
"//src/material/legacy-core:theming_scss_lib",
14+
],
1215
)
1316

1417
# Sass binary which is used to ensure that our themes will compile with the legacy and new
@@ -18,7 +21,10 @@ sass_binary(
1821
name = "test-theming-api",
1922
testonly = True,
2023
src = "test-theming-api.scss",
21-
deps = ["//src/material/core:theming_scss_lib"],
24+
deps = [
25+
"//src/material/core:theming_scss_lib",
26+
"//src/material/legacy-core:theming_scss_lib",
27+
],
2228
)
2329

2430
# Sass binary used to ensure that the theming bundle works as expected.

src/material/core/theming/tests/test-css-variables-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
)
3333
));
3434
@include all-theme.all-component-themes(replace-all-values($theme, var(--test-var)));
35-
@include legacy-all-theme.all-legacy-component-themes(replace-all-values($theme, var(--test-var)));
35+
@include legacy-all-theme.all-legacy-component-themes(
36+
replace-all-values($theme, var(--test-var)));
3637
}

src/material/core/theming/tests/test-theming-api.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@ $dark-theme-only-typography: theming.define-dark-theme((typography: $typography-
282282

283283
@include all-density.all-component-densities(map.get($light-theme-only-density, density));
284284
@include all-density.all-component-densities($light-theme-only-density);
285-
@include legacy-all-density.all-legacy-component-densities(map.get($light-theme-only-density, density));
285+
@include legacy-all-density.all-legacy-component-densities(
286+
map.get($light-theme-only-density, density));
286287
@include legacy-all-density.all-legacy-component-densities($light-theme-only-density);
287288

288289
@include legacy-all-color.all-legacy-component-colors(map.get($new-api-dark-theme, color));

0 commit comments

Comments
 (0)