File tree Expand file tree Collapse file tree 5 files changed +16
-3
lines changed Expand file tree Collapse file tree 5 files changed +16
-3
lines changed Original file line number Diff line number Diff line change 131
131
# Material experimental package
132
132
/src /material-experimental /* @ andrewseguin
133
133
/src /material-experimental /column-resize /** @ andrewseguin
134
- /src /material-experimental /mdc-tooltip /** @ crisbeto
135
134
/src /material-experimental /menubar /** @ jelbourn
136
135
/src /material-experimental /popover-edit /** @ andrewseguin
137
136
/src /material-experimental /selection /** @ andrewseguin
137
+ /src /material-experimental /theming /** @ mmalerba
138
138
139
139
# CDK experimental package
140
140
/src /cdk-experimental /* @ andrewseguin
Original file line number Diff line number Diff line change @@ -19,7 +19,9 @@ ts_library(
19
19
20
20
sass_library (
21
21
name = "theming_scss_lib" ,
22
- srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS ,
22
+ srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [
23
+ "//src/material-experimental/theming:theming_scss_lib" ,
24
+ ],
23
25
)
24
26
25
27
sass_library (
Original file line number Diff line number Diff line change
1
+ load ("//tools:defaults.bzl" , "sass_library" )
2
+
3
+ package (default_visibility = ["//visibility:public" ])
4
+
5
+ sass_library (
6
+ name = "theming_scss_lib" ,
7
+ srcs = glob (["**/_*.scss" ]),
8
+ deps = ["//src/material:sass_lib" ],
9
+ )
Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ sass_library(
24
24
srcs = [
25
25
"_index.scss" ,
26
26
"_theming.scss" ,
27
+ "_token-theming.scss" ,
27
28
],
28
29
deps = [
29
30
"//src/material/core:core_scss_lib" ,
Original file line number Diff line number Diff line change 2
2
@use ' sass:map' ;
3
3
@use ' ../../token-utils' ;
4
4
@use ' ../../../mdc-helpers/mdc-helpers' ;
5
+ @use ' ../../../style/sass-utils' ;
5
6
@use ' ../../../theming/theming' ;
6
7
@use ' ../../../typography/typography-utils' ;
7
8
@@ -304,7 +305,7 @@ $prefix: (mdc, chip);
304
305
// Combines the tokens generated by the above functions into a single map with placeholder values.
305
306
// This is used to create token slots.
306
307
@function get-token-slots () {
307
- @return token -utils .merge-all (
308
+ @return sass -utils .deep- merge-all (
308
309
get-unthemable-tokens (),
309
310
get-color-tokens (token-utils .$placeholder-color-config ),
310
311
get-typography-tokens (token-utils .$placeholder-typography-config ),
You can’t perform that action at this time.
0 commit comments