Skip to content

Commit 7f44de2

Browse files
black7375black7375
committed
Clean: Icon - layout menu
1 parent 3985ace commit 7f44de2

File tree

2 files changed

+96
-111
lines changed

2 files changed

+96
-111
lines changed

‎css/leptonChrome.css

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5982,13 +5982,13 @@
59825982
/* Icon */
59835983
:not(menu, #ContentSelectDropdown)
59845984
> menupopup
5985-
> menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
5985+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
59865986
:not(menu, #ContentSelectDropdown)
59875987
> menupopup
59885988
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
59895989
#main-menubar > menu,
59905990
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
5991-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
5991+
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
59925992
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
59935993
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
59945994
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
@@ -6009,10 +6009,10 @@
60096009
@supports -moz-bool-pref("widget.macos.native-context-menus") {
60106010
:not(menu, #ContentSelectDropdown)
60116011
> menupopup
6012-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6012+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
60136013
:not(menu, #ContentSelectDropdown)
60146014
> menupopup
6015-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) {
6015+
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) {
60166016
list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
60176017
}
60186018
}
@@ -6024,8 +6024,14 @@
60246024

60256025
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic),
60266026
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic),
6027+
:not(menu, #ContentSelectDropdown, #context-navigation)
6028+
> menupopup
6029+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
6030+
:not(menu, #ContentSelectDropdown, #context-navigation)
6031+
> menupopup
6032+
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
60276033
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
6028-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
6034+
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
60296035
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
60306036
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
60316037
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
@@ -6044,17 +6050,14 @@
60446050
padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
60456051
padding-inline-end: 3px;
60466052
}
6047-
60486053
#main-menubar > menu:first-child {
60496054
background-position: left calc(3px + var(--context-menu-background-padding-default)) center !important;
60506055
padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important;
60516056
}
6052-
60536057
#main-menubar > menu > menupopup {
60546058
--menuitem-image: none;
60556059
/* Prevent Image Inheritance */
60566060
}
6057-
60586061
@supports not -moz-bool-pref("userChrome.padding.global_menubar") {
60596062
#main-menubar > menu {
60606063
padding-block: 2px !important;
@@ -6096,12 +6099,12 @@
60966099
(-moz-platform: windows-win8) {
60976100
:not(menu, #ContentSelectDropdown, #context-navigation)
60986101
> menupopup
6099-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6102+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
61006103
:not(menu, #ContentSelectDropdown, #context-navigation)
61016104
> menupopup
6102-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6105+
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
61036106
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
6104-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
6107+
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
61056108
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
61066109
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
61076110
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
@@ -6125,12 +6128,12 @@
61256128

61266129
:not(menu, #ContentSelectDropdown, #context-navigation)
61276130
> menupopup
6128-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6131+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
61296132
:not(menu, #ContentSelectDropdown, #context-navigation)
61306133
> menupopup
6131-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6134+
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
61326135
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
6133-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
6136+
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
61346137
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
61356138
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
61366139
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
@@ -6162,17 +6165,17 @@
61626165
/* context menu width */
61636166
:not(menu, #ContentSelectDropdown, #context-navigation)
61646167
> menupopup
6165-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6168+
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]),
61666169
:not(menu, #ContentSelectDropdown, #context-navigation)
61676170
> menupopup
6168-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
6171+
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
61696172
#blockedPopupDontShowMessage {
61706173
padding-inline-end: var(--context-menu-background-padding) !important;
61716174
}
61726175

61736176
/* text position */
61746177
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem > .menu-text,
6175-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu > menu-text {
6178+
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu > .menu-text {
61766179
padding-inline-start: var(--context-menu-mac-padding) !important;
61776180
}
61786181

@@ -6184,10 +6187,7 @@
61846187

61856188
/* Global Menu */
61866189
/* Disabled. some icons not appear
6187-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
6188-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
6189-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
6190-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) {
6190+
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type=checkbox], [checked=true]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [type=checkbox], [checked=true]) {
61916191
list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
61926192
}
61936193
*/

‎src/icons/_layout_menu.scss

Lines changed: 75 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,57 @@ menupopup menu:not([type="checkbox"], [type="radio"]),
44
-moz-appearance: none !important; /* Linux: menulist */
55
}
66

7+
//-- Mixin ---------------------------------------------------------------------
8+
// Items
9+
$_iconNoneCommon: ".in-menulist, [type=\"checkbox\"], [checked=\"true\"]";
10+
$_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneCommon})";
11+
$_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})";
12+
13+
// Components
14+
$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
15+
$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
16+
$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)";
17+
18+
$_nestedPopupIconMenus: selector.nest(
19+
$_nestedPopupIcon,
20+
"#{$_iconMenuitem}, #{$_iconMenu}"
21+
);
22+
$_nestedPopupPaddingMenus: selector.nest(
23+
$_nestedPopupPadding,
24+
"#{$_iconMenuitem}, #{$_iconMenu}"
25+
);
26+
$_iconMenuPopupMenus: selector.nest(
27+
$_iconMenuPopup,
28+
"#{$_iconMenuitem}, #{$_iconMenu}"
29+
);
30+
31+
$_globalMenus: "#main-menubar > menu";
32+
$_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem";
33+
$_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu";
34+
$_sendTabMenuitem: "menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem";
35+
$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage";
36+
37+
@mixin _layoutIconMenus() {
38+
#{$_nestedPopupPaddingMenus},
39+
#{$_iconMenuPopupMenus},
40+
#{$_libraryMenuitem},
41+
#{$_libraryMenu},
42+
#{$_sendTabMenuitem},
43+
#{$_otherIconMenu} {
44+
@content;
45+
}
46+
}
47+
48+
//------------------------------------------------------------------------------
49+
750
/* Icon */
8-
:not(menu, #ContentSelectDropdown)
9-
> menupopup
10-
> menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
11-
:not(menu, #ContentSelectDropdown)
12-
> menupopup
13-
> menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
14-
#main-menubar > menu,
15-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
16-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
17-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
18-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
19-
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
20-
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
21-
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
22-
.openintabs-menuitem,
23-
#blockedPopupDontShowMessage {
51+
#{$_nestedPopupIconMenus},
52+
#{$_globalMenus},
53+
#{$_iconMenuPopupMenus},
54+
#{$_libraryMenuitem},
55+
#{$_libraryMenu},
56+
#{$_sendTabMenuitem},
57+
#{$_otherIconMenu} {
2458
/* Color */
2559
-moz-context-properties: fill, fill-opacity !important;
2660
fill: currentColor !important;
@@ -33,12 +67,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
3367

3468
/* For native context menus on macOS */
3569
@supports -moz-bool-pref("widget.macos.native-context-menus") {
36-
:not(menu, #ContentSelectDropdown)
37-
> menupopup
38-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
39-
:not(menu, #ContentSelectDropdown)
40-
> menupopup
41-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) {
70+
#{$_nestedPopupIconMenus} {
4271
list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
4372
}
4473
}
@@ -48,39 +77,33 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
4877
--context-menu-background-padding-default: 5px;
4978
--context-menu-background-padding: var(--context-menu-background-padding-default);
5079
}
51-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic),
52-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic),
53-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
54-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
55-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
56-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
57-
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
58-
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
59-
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
60-
.openintabs-menuitem,
61-
#blockedPopupDontShowMessage {
80+
#{selector.nest($_nestedPopupPadding, "menuitem:not(.menuitem-iconic), menu:not(.menu-iconic)")},
81+
#{$_nestedPopupPaddingMenus},
82+
#{$_iconMenuPopupMenus},
83+
#{$_libraryMenuitem},
84+
#{$_libraryMenu},
85+
#{$_sendTabMenuitem},
86+
#{$_otherIconMenu} {
6287
background-position: left var(--context-menu-background-padding) center !important;
6388
padding-inline-start: var(--context-menu-background-padding) !important;
6489
}
6590

6691
/* Menubar */
6792
@include Option("userChrome.icon.global_menubar") {
68-
#main-menubar > menu {
93+
#{$_globalMenus} {
6994
background-position: left var(--context-menu-background-padding-default) center !important;
7095
padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
7196
padding-inline-end: 3px;
72-
}
73-
#main-menubar > menu:first-child {
74-
background-position: left calc(3px + var(--context-menu-background-padding-default)) center !important;
75-
padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important;
76-
}
77-
#main-menubar > menu > menupopup {
78-
--menuitem-image: none; /* Prevent Image Inheritance */
79-
}
8097

81-
@include NotOption("userChrome.padding.global_menubar") {
82-
#main-menubar > menu {
83-
padding-block: 2px !important;;
98+
&:first-child {
99+
background-position: left calc(3px + var(--context-menu-background-padding-default)) center !important;
100+
padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important;
101+
}
102+
> menupopup {
103+
--menuitem-image: none; /* Prevent Image Inheritance */
104+
}
105+
@include NotOption("userChrome.padding.global_menubar") {
106+
padding-block: 2px !important;
84107
}
85108
}
86109
}
@@ -110,21 +133,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
110133
}
111134
}
112135
@include OS($win7, $win8) {
113-
:not(menu, #ContentSelectDropdown, #context-navigation)
114-
> menupopup
115-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
116-
:not(menu, #ContentSelectDropdown, #context-navigation)
117-
> menupopup
118-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
119-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
120-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
121-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
122-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
123-
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
124-
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
125-
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
126-
.openintabs-menuitem,
127-
#blockedPopupDontShowMessage {
136+
@include _layoutIconMenus {
128137
background-position: left var(--context-menu-background-padding) center !important;
129138
padding-inline-start: 0 !important;
130139
}
@@ -136,21 +145,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
136145
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
137146
}
138147

139-
:not(menu, #ContentSelectDropdown, #context-navigation)
140-
> menupopup
141-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
142-
:not(menu, #ContentSelectDropdown, #context-navigation)
143-
> menupopup
144-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
145-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
146-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
147-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
148-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
149-
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
150-
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
151-
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
152-
.openintabs-menuitem,
153-
#blockedPopupDontShowMessage {
148+
@include _layoutIconMenus {
154149
padding-inline-start: var(--menu-background-padding-default) !important;
155150
margin-left: 0 !important;
156151
}
@@ -162,7 +157,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
162157
--context-menu-background-padding-default: 6px;
163158
}
164159

165-
#main-menubar > menu > .menubar-text {
160+
#{$_globalMenus} > .menubar-text {
166161
padding-inline-start: 3px;
167162
}
168163
}
@@ -175,34 +170,24 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
175170
}
176171

177172
/* context menu width */
178-
:not(menu, #ContentSelectDropdown, #context-navigation)
179-
> menupopup
180-
> menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
181-
:not(menu, #ContentSelectDropdown, #context-navigation)
182-
> menupopup
183-
> menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
173+
#{$_nestedPopupPaddingMenus},
184174
#blockedPopupDontShowMessage {
185175
padding-inline-end: var(--context-menu-background-padding) !important;
186176
}
187177

188178
/* text position */
189-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem > .menu-text,
190-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu > menu-text {
179+
#{selector.nest($_nestedPopupPadding, "menuitem > .menu-text, menu > .menu-text")} {
191180
padding-inline-start: var(--context-menu-mac-padding) !important;
192181
}
193182

194183
/* Checkbox menuitem, None iconic menu */
195-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"],
196-
:not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic) {
184+
#{selector.nest($_nestedPopupPadding, "menuitem[type=\"checkbox\"], menu:not(.menu-iconic)")} {
197185
padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
198186
}
199187

200188
/* Global Menu */
201189
/* Disabled. some icons not appear
202-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
203-
menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item),
204-
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
205-
menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) {
190+
#{$_iconMenuPopupMenus} {
206191
list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
207192
}
208193
*/

0 commit comments

Comments
 (0)