@@ -25,61 +25,28 @@ span.filter-menu__radio {
2525 min-width : 18px ;
2626 width : 18px ;
2727}
28- span .filter-menu__checkbox svg .icon--checkbox-unchecked {
29- color : var (--filter-menu-item-unchecked-color , var (--color-foreground-secondary ));
30- display : block;
31- height : 18px ;
32- width : 18px ;
33- }
34- span .filter-menu__checkbox svg .icon--checkbox-checked {
35- color : var (--filter-menu-item-checked-color , var (--color-foreground-primary ));
36- display : none;
37- height : 18px ;
38- width : 18px ;
39- }
40- span .filter-menu__radio svg .icon--radio-unchecked {
41- color : var (--filter-menu-item-unchecked-color , var (--color-foreground-secondary ));
42- display : block;
43- height : 18px ;
44- width : 18px ;
45- }
46- span .filter-menu__radio svg .icon--radio-checked {
47- color : var (--filter-menu-item-checked-color , var (--color-foreground-primary ));
48- display : none;
28+ span .filter-menu__checkbox svg ,
29+ span .filter-menu__radio svg {
30+ color : var (--filter-menu-item-icon-color , var (--color-foreground-primary ));
4931 height : 18px ;
5032 width : 18px ;
5133}
52- .filter-menu-form__item span .checkbox {
53- align-items : flex-start;
54- display : flex;
55- flex-shrink : 1 ;
56- justify-content : center;
57- }
58- .filter-menu-form__item span .checkbox svg .checkbox__unchecked {
59- color : var (--filter-menu-item-unchecked-color , var (--color-foreground-primary ));
60- }
61- .filter-menu-form__item span .checkbox svg .checkbox__checked {
62- color : var (--filter-menu-item-checked-color , var (--color-foreground-primary ));
63- }
34+ .filter-menu-form__item span .checkbox ,
6435.filter-menu-form__item span .radio {
6536 align-items : flex-start;
6637 display : flex;
6738 flex-shrink : 1 ;
6839 justify-content : center;
6940}
70- .filter-menu-form__item span .radio svg .radio__unchecked {
71- color : var (--filter-menu-item-unchecked-color , var (--color-foreground-secondary ));
72- }
73- .filter-menu-form__item span .radio svg .radio__checked {
41+ .filter-menu-form__item span .checkbox .checkbox__icon > svg ,
42+ .filter-menu-form__item span .radio .checkbox__icon > svg {
7443 color : var (--filter-menu-item-checked-color , var (--color-foreground-primary ));
7544}
76- span .filter-menu__item [role = "menuitemcheckbox" ],
77- span .filter-menu__item [role = "menuitemradio" ],
45+ span .filter-menu__item [role ^= "menuitem" ],
7846span .filter-menu-form__item {
7947 display : block;
8048}
81- .filter-menu__item [role = "menuitemcheckbox" ],
82- .filter-menu__item [role = "menuitemradio" ],
49+ .filter-menu__item [role ^= "menuitem" ],
8350.filter-menu-form__item {
8451 background-color : var (--filter-menu-item-background-color , var (--color-background-primary ));
8552 box-sizing : border-box;
@@ -92,13 +59,29 @@ span.filter-menu-form__item {
9259 width : 100% ;
9360 padding : 8px 16px ;
9461}
95- .filter-menu__item [role = "menuitemcheckbox" ]: hover ,
96- .filter-menu__item [role = "menuitemradio" ]: hover ,
62+ .filter-menu__item [role ^= "menuitem" ]: hover ,
9763.filter-menu-form__item : hover {
9864 background-color : var (--color-state-primary-hover , color-state-primary-hover);
9965}
100- .filter-menu__item [role = "menuitemcheckbox" ]: last-child ,
101- .filter-menu__item [role = "menuitemradio" ]: last-child ,
66+ .filter-menu__item [role ^= "menuitem" ]: disabled ,
67+ .filter-menu-form__item : disabled ,
68+ .filter-menu__item [role ^= "menuitem" ][aria-disabled = "true" ],
69+ .filter-menu-form__item [aria-disabled = "true" ] {
70+ color : var (--filter-menu-item-foreground-color-disabled , var (--color-foreground-disabled ));
71+ }
72+ .filter-menu__item [role ^= "menuitem" ]: disabled span > svg ,
73+ .filter-menu-form__item : disabled span > svg ,
74+ .filter-menu__item [role ^= "menuitem" ][aria-disabled = "true" ] span > svg ,
75+ .filter-menu-form__item [aria-disabled = "true" ] span > svg {
76+ color : var (--filter-menu-item-icon-color-disabled , var (--color-foreground-disabled ));
77+ }
78+ .filter-menu__item [role ^= "menuitem" ]: disabled : hover ,
79+ .filter-menu-form__item : disabled : hover ,
80+ .filter-menu__item [role ^= "menuitem" ][aria-disabled = "true" ]: hover ,
81+ .filter-menu-form__item [aria-disabled = "true" ]: hover {
82+ background-color : inherit;
83+ }
84+ .filter-menu__item [role ^= "menuitem" ]: last-child ,
10285.filter-menu-form__item : last-child {
10386 margin-bottom : 8px ;
10487}
@@ -124,6 +107,24 @@ button.filter-menu__footer:hover,
124107button .filter-menu-form__footer [type = "submit" ]: hover {
125108 background-color : var (--color-state-primary-hover , color-state-primary-hover);
126109}
110+ button .filter-menu__footer : disabled ,
111+ button .filter-menu-form__footer [type = "submit" ]: disabled ,
112+ button .filter-menu__footer [aria-disabled = "true" ],
113+ button .filter-menu-form__footer [type = "submit" ][aria-disabled = "true" ] {
114+ color : var (--filter-menu-item-foreground-color-disabled , var (--color-foreground-disabled ));
115+ }
116+ button .filter-menu__footer : disabled span > svg ,
117+ button .filter-menu-form__footer [type = "submit" ]: disabled span > svg ,
118+ button .filter-menu__footer [aria-disabled = "true" ] span > svg ,
119+ button .filter-menu-form__footer [type = "submit" ][aria-disabled = "true" ] span > svg {
120+ color : var (--filter-menu-item-icon-color-disabled , var (--color-foreground-disabled ));
121+ }
122+ button .filter-menu__footer : disabled : hover ,
123+ button .filter-menu-form__footer [type = "submit" ]: disabled : hover ,
124+ button .filter-menu__footer [aria-disabled = "true" ]: hover ,
125+ button .filter-menu-form__footer [type = "submit" ][aria-disabled = "true" ]: hover {
126+ background-color : inherit;
127+ }
127128button .filter-menu__footer : hover ,
128129button .filter-menu-form__footer [type = "submit" ]: hover {
129130 background-color : var (--color-state-primary-hover );
@@ -133,6 +134,14 @@ button.filter-menu-form__footer[type="submit"]:hover {
133134 flex-grow : 1 ;
134135 margin-left : 8px ;
135136}
137+ .filter-menu__item [role = "menuitemcheckbox" ] svg .icon--checkbox-checked ,
138+ .filter-menu__item [role = "menuitemradio" ] svg .icon--radio-checked {
139+ display : none;
140+ }
141+ .filter-menu__item [role = "menuitemcheckbox" ] svg .icon--checkbox-unchecked ,
142+ .filter-menu__item [role = "menuitemradio" ] svg .icon--radio-unchecked {
143+ display : block;
144+ }
136145.filter-menu__item [role = "menuitemcheckbox" ][aria-checked = "true" ] svg .icon--checkbox-unchecked ,
137146.filter-menu__item [role = "menuitemradio" ][aria-checked = "true" ] svg .icon--radio-unchecked {
138147 display : none;
0 commit comments