Prelim: Fix regressions in apply-category, fix up menuitem selectors for Start menu

This commit is contained in:
Rory Fewell
2022-09-18 18:51:48 +01:00
committed by Rory Fewell
parent be1004e0fe
commit 1c7b2707e1
3 changed files with 40 additions and 18 deletions

View File

@@ -111,21 +111,14 @@ window.csd.xp-start-menu // Specificity hack -_-
> menuitem,
> separator
{
@include __wintc_apply_props_excluding(
@include __wintc_apply_specific_props(
$start_menu_menustrip_menuitem_styles,
lists-merge(
__wintc_get_category_props(font),
__wintc_get_category_props(
box-model,
"margin-bottom"
)
)...
);
&:hover
{
@include __wintc_apply_props(
$start_menu_menustrip_menuitem_hover_styles
);
}
&:not(:last-child)
{
@include __wintc_apply_specific_props(
@@ -135,12 +128,41 @@ window.csd.xp-start-menu // Specificity hack -_-
}
}
> menuitem:hover > box > label
> menuitem
{
@include __wintc_apply_props_for_category(
$start_menu_menustrip_menuitem_hover_styles,
font
@include __wintc_apply_props_excluding(
$start_menu_menustrip_menuitem_styles,
lists-merge(
__wintc_get_category_props(box-model),
__wintc_get_category_props(font)
)...
);
> box label
{
@include __wintc_apply_props_for_category(
$start_menu_menustrip_menuitem_styles,
font
);
}
&:hover
{
@include __wintc_apply_props_not_in_category(
$start_menu_menustrip_menuitem_hover_styles,
font
);
> box label
{
@include __wintc_apply_props_for_category(
$start_menu_menustrip_menuitem_hover_styles,
font
);
}
}
}
> separator

View File

@@ -86,7 +86,7 @@
{
@include __wintc_apply_specific_props(
$theme_part_map,
__wintc_get_category_props($ruleset)
__wintc_get_category_props($ruleset)...
);
}
@@ -97,6 +97,6 @@
{
@include __wintc_apply_props_excluding(
$theme_part_map,
__wintc_get_category_props($ruleset)
__wintc_get_category_props($ruleset)...
);
}

View File

@@ -191,7 +191,7 @@ $start_menu_menustrip_menuitem_hover_styles:
false,
underline,
undefined,
undefined
solid
);