Skip to content

Commit 53d4e3d

Browse files
authored
refactor: remove unused m2 mixin (#31210)
* refactor: remove unused m2 mixin * refactor: remove unused m2 mixin * refactor: build updates * refactor: build updates
1 parent 512433b commit 53d4e3d

File tree

9 files changed

+8
-182
lines changed

9 files changed

+8
-182
lines changed

src/material/_index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
@forward './core/theming/theming' as private-* show private-clamp-density;
1818
@forward './core/typography/typography' show typography-hierarchy;
1919
@forward './core/typography/typography-utils' show font-shorthand;
20-
@forward 'core/tokens/m2-tokens' show m2-tokens-from-theme;
2120
@forward './core/tokens/m3-system' show system-level-colors,
2221
system-level-typography, system-level-elevation, system-level-shape,
2322
system-level-motion, system-level-state, theme, theme-overrides;

src/material/core/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ sass_library(
8686
"_core-theme.scss",
8787
],
8888
deps = [
89+
":m2",
8990
"//src/material/core:ripple_sass_theme",
9091
"//src/material/core/option:theme",
9192
"//src/material/core/selection/pseudo-checkbox:sass_theme",

src/material/core/option/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ sass_library(
3535
"_option-theme.scss",
3636
],
3737
deps = [
38+
":m2",
3839
"//src/material/core/style:sass_utils",
3940
"//src/material/core/theming",
4041
"//src/material/core/theming:_inspection",

src/material/core/selection/pseudo-checkbox/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ sass_library(
4848
"_pseudo-checkbox-theme.scss",
4949
],
5050
deps = [
51+
":m2",
5152
"//src/material/core/style:sass_utils",
5253
"//src/material/core/theming",
5354
"//src/material/core/theming:_inspection",

src/material/core/tokens/BUILD.bazel

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ sass_library(
4848
srcs = ["_m3-tokens.scss"],
4949
deps = [
5050
":format_tokens",
51-
":m2_tokens",
5251
"//src/material/autocomplete:m3",
5352
"//src/material/badge:m3",
5453
"//src/material/bottom-sheet:m3",
@@ -93,52 +92,3 @@ sass_library(
9392
"//src/material/tree:m3",
9493
],
9594
)
96-
97-
sass_library(
98-
name = "m2_tokens",
99-
srcs = ["_m2-tokens.scss"],
100-
deps = [
101-
":format_tokens",
102-
"//src/material/autocomplete:m2",
103-
"//src/material/badge:m2",
104-
"//src/material/bottom-sheet:m2",
105-
"//src/material/button:m2",
106-
"//src/material/button-toggle:m2",
107-
"//src/material/card:m2",
108-
"//src/material/checkbox:m2",
109-
"//src/material/chips:m2",
110-
"//src/material/core:m2",
111-
"//src/material/core:ripple_m2",
112-
"//src/material/core/m2:m2_sass",
113-
"//src/material/core/option:m2",
114-
"//src/material/core/selection/pseudo-checkbox:m2",
115-
"//src/material/core/style:sass_utils",
116-
"//src/material/core/theming",
117-
"//src/material/datepicker:m2",
118-
"//src/material/dialog:m2",
119-
"//src/material/divider:m2",
120-
"//src/material/expansion:m2",
121-
"//src/material/form-field:m2",
122-
"//src/material/grid-list:m2",
123-
"//src/material/icon:m2",
124-
"//src/material/list:m2",
125-
"//src/material/menu:m2",
126-
"//src/material/paginator:m2",
127-
"//src/material/progress-bar:m2",
128-
"//src/material/progress-spinner:m2",
129-
"//src/material/radio:m2",
130-
"//src/material/select:m2",
131-
"//src/material/sidenav:m2",
132-
"//src/material/slide-toggle:m2",
133-
"//src/material/slider:m2",
134-
"//src/material/snack-bar:m2",
135-
"//src/material/sort:m2",
136-
"//src/material/stepper:m2",
137-
"//src/material/table:m2",
138-
"//src/material/tabs:m2",
139-
"//src/material/timepicker:m2",
140-
"//src/material/toolbar:m2",
141-
"//src/material/tooltip:m2",
142-
"//src/material/tree:m2",
143-
],
144-
)

src/material/core/tokens/_m2-tokens.scss

Lines changed: 0 additions & 131 deletions
This file was deleted.

src/material/form-field/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ sass_library(
3939
"_form-field-theme.scss",
4040
],
4141
deps = [
42+
":m2",
4243
"//src/material/core/style:sass_utils",
4344
"//src/material/core/theming",
4445
"//src/material/core/theming:_inspection",

src/material/list/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ sass_library(
4242
],
4343
deps = [
4444
":m2",
45+
"//src/material/checkbox:m2",
4546
"//src/material/core/style:sass_utils",
4647
"//src/material/core/theming",
4748
"//src/material/core/theming:_inspection",
4849
"//src/material/core/theming:_validation",
4950
"//src/material/core/tokens:token_utils",
5051
"//src/material/core/typography",
52+
"//src/material/radio:m2",
5153
],
5254
)
5355

src/material/tabs/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ sass_library(
1818
],
1919
deps = [
2020
"//src/material/core/style:sass_utils",
21+
"//src/material/core/theming:_inspection",
2122
"//src/material/core/tokens:m3_utils",
2223
],
2324
)
@@ -41,6 +42,7 @@ sass_library(
4142
"_tabs-theme.scss",
4243
],
4344
deps = [
45+
":m2",
4446
"//src/material/core/style:sass_utils",
4547
"//src/material/core/theming",
4648
"//src/material/core/theming:_inspection",

0 commit comments

Comments
 (0)