Skip to content

refactor: remove unused m2 mixin #31210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 29, 2025
Merged

refactor: remove unused m2 mixin #31210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d76de5e
refactor: remove unused m2 mixin
andrewseguin May 23, 2025
aa44d99
refactor: remove unused m2 mixin
andrewseguin May 23, 2025
8155a2c
refactor: build updates
andrewseguin May 23, 2025
5c02a23
refactor: build updates
andrewseguin May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/material/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@forward './core/theming/theming' as private-* show private-clamp-density;
@forward './core/typography/typography' show typography-hierarchy;
@forward './core/typography/typography-utils' show font-shorthand;
@forward 'core/tokens/m2-tokens' show m2-tokens-from-theme;
@forward './core/tokens/m3-system' show system-level-colors,
system-level-typography, system-level-elevation, system-level-shape,
system-level-motion, system-level-state, theme, theme-overrides;
Expand Down
1 change: 1 addition & 0 deletions src/material/core/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ sass_library(
"_core-theme.scss",
],
deps = [
":m2",
"//src/material/core:ripple_sass_theme",
"//src/material/core/option:theme",
"//src/material/core/selection/pseudo-checkbox:sass_theme",
Expand Down
1 change: 1 addition & 0 deletions src/material/core/option/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ sass_library(
"_option-theme.scss",
],
deps = [
":m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/core/theming:_inspection",
Expand Down
1 change: 1 addition & 0 deletions src/material/core/selection/pseudo-checkbox/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ sass_library(
"_pseudo-checkbox-theme.scss",
],
deps = [
":m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/core/theming:_inspection",
Expand Down
50 changes: 0 additions & 50 deletions src/material/core/tokens/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ sass_library(
srcs = ["_m3-tokens.scss"],
deps = [
":format_tokens",
":m2_tokens",
"//src/material/autocomplete:m3",
"//src/material/badge:m3",
"//src/material/bottom-sheet:m3",
Expand Down Expand Up @@ -93,52 +92,3 @@ sass_library(
"//src/material/tree:m3",
],
)

sass_library(
name = "m2_tokens",
srcs = ["_m2-tokens.scss"],
deps = [
":format_tokens",
"//src/material/autocomplete:m2",
"//src/material/badge:m2",
"//src/material/bottom-sheet:m2",
"//src/material/button:m2",
"//src/material/button-toggle:m2",
"//src/material/card:m2",
"//src/material/checkbox:m2",
"//src/material/chips:m2",
"//src/material/core:m2",
"//src/material/core:ripple_m2",
"//src/material/core/m2:m2_sass",
"//src/material/core/option:m2",
"//src/material/core/selection/pseudo-checkbox:m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/datepicker:m2",
"//src/material/dialog:m2",
"//src/material/divider:m2",
"//src/material/expansion:m2",
"//src/material/form-field:m2",
"//src/material/grid-list:m2",
"//src/material/icon:m2",
"//src/material/list:m2",
"//src/material/menu:m2",
"//src/material/paginator:m2",
"//src/material/progress-bar:m2",
"//src/material/progress-spinner:m2",
"//src/material/radio:m2",
"//src/material/select:m2",
"//src/material/sidenav:m2",
"//src/material/slide-toggle:m2",
"//src/material/slider:m2",
"//src/material/snack-bar:m2",
"//src/material/sort:m2",
"//src/material/stepper:m2",
"//src/material/table:m2",
"//src/material/tabs:m2",
"//src/material/timepicker:m2",
"//src/material/toolbar:m2",
"//src/material/tooltip:m2",
"//src/material/tree:m2",
],
)
131 changes: 0 additions & 131 deletions src/material/core/tokens/_m2-tokens.scss
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/material/form-field/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ sass_library(
"_form-field-theme.scss",
],
deps = [
":m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/core/theming:_inspection",
Expand Down
2 changes: 2 additions & 0 deletions src/material/list/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ sass_library(
],
deps = [
":m2",
"//src/material/checkbox:m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/core/theming:_inspection",
"//src/material/core/theming:_validation",
"//src/material/core/tokens:token_utils",
"//src/material/core/typography",
"//src/material/radio:m2",
],
)

Expand Down
2 changes: 2 additions & 0 deletions src/material/tabs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ sass_library(
],
deps = [
"//src/material/core/style:sass_utils",
"//src/material/core/theming:_inspection",
"//src/material/core/tokens:m3_utils",
],
)
Expand All @@ -41,6 +42,7 @@ sass_library(
"_tabs-theme.scss",
],
deps = [
":m2",
"//src/material/core/style:sass_utils",
"//src/material/core/theming",
"//src/material/core/theming:_inspection",
Expand Down
Loading