Skip to content

Commit 6eb247c

Browse files
committed
unstyle places popups from nara only if native
This replaces the previous implementation completely. However there is no way to access it under 7/8 currently since it seems to always be native based there.
1 parent 22688d4 commit 6eb247c

File tree

1 file changed

+103
-0
lines changed

1 file changed

+103
-0
lines changed

browser/themes/shared/customizableui/panelUI-shared.css

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,97 @@ panelview {
242242
margin: var(--arrowpanel-menuitem-margin);
243243
}
244244

245+
/* Tweaks for menupopups hanging off toolbar buttons to make them feel like panels */
246+
247+
@media (-moz-windows-non-native-menus) {
248+
.toolbar-menupopup {
249+
&,
250+
menupopup {
251+
appearance: none;
252+
border: none;
253+
font: menu;
254+
background-color: transparent;
255+
--panel-background: var(--arrowpanel-background);
256+
--panel-color: var(--arrowpanel-color);
257+
--panel-border-color: var(--arrowpanel-border-color);
258+
--panel-border-radius: var(--arrowpanel-border-radius);
259+
--panel-padding: var(--panel-subview-body-padding);
260+
}
261+
262+
menupopup {
263+
/* Align non top-level menupopup's first menuitem with the menuitem that opened it.
264+
* The 1px is for the menupopup's border. */
265+
margin-top: calc(-1 * (var(--panel-subview-body-padding-block) + var(--panel-shadow-margin) + 1px));
266+
}
267+
268+
:is(menu, menuitem) {
269+
&[disabled] {
270+
color: var(--panel-disabled-color);
271+
}
272+
273+
&:not([disabled])[_moz-menuactive] {
274+
color: inherit;
275+
background-color: var(--panel-item-hover-bgcolor);
276+
277+
&:active {
278+
color: inherit;
279+
background-color: var(--panel-item-active-bgcolor);
280+
}
281+
}
282+
283+
&::before,
284+
&::after {
285+
content: none; /* Reset's macOS' checkmark spacing */
286+
}
287+
}
288+
289+
.menu-text,
290+
.menu-iconic-text,
291+
.menu-iconic-icon,
292+
.menu-iconic-left,
293+
.menu-iconic-accel,
294+
.menu-accel-container,
295+
.menu-accel,
296+
.menu-right {
297+
/* Reset every spacing and appearance set by the platforms' menu.css
298+
* and set the ones we need in the following rules. */
299+
margin: 0;
300+
padding: 0;
301+
appearance: none;
302+
}
303+
304+
:is(.menu-iconic, .menuitem-iconic) > .menu-iconic-left {
305+
margin-inline-end: 8px;
306+
}
307+
308+
.menu-accel,
309+
.menu-iconic-accel {
310+
margin-inline-start: 16px;
311+
}
312+
313+
menu > .menu-right {
314+
list-style-image: url(chrome://global/skin/icons/arrow-right.svg);
315+
-moz-context-properties: fill, fill-opacity;
316+
fill: currentColor;
317+
fill-opacity: 0.6;
318+
width: unset;
319+
height: unset;
320+
321+
&:-moz-locale-dir(rtl) {
322+
list-style-image: url(chrome://global/skin/icons/arrow-left.svg);
323+
}
324+
}
325+
326+
menuseparator {
327+
padding: var(--panel-separator-margin);
328+
}
329+
}
330+
331+
:is(.toolbar-menupopup, .toolbar-menupopup menupopup)[emptyplacesresult] > menuitem > .menu-accel-container > .menu-accel {
332+
margin: 0;
333+
}
334+
}
335+
245336
#BMB_bookmarksPopup {
246337
max-width: 30em;
247338
}
@@ -914,6 +1005,18 @@ panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow {
9141005
display: none;
9151006
}
9161007

1008+
@media (-moz-windows-non-native-menus) {
1009+
.toolbar-menupopup :is(menu, menuitem) {
1010+
appearance: none;
1011+
margin: var(--arrowpanel-menuitem-margin);
1012+
min-height: 24px;
1013+
padding: var(--arrowpanel-menuitem-padding);
1014+
border-radius: var(--arrowpanel-menuitem-border-radius);
1015+
background-color: transparent;
1016+
flex-shrink: 0;
1017+
}
1018+
}
1019+
9171020
.subview-subheader,
9181021
panelview .toolbarbutton-1,
9191022
.subviewbutton,

0 commit comments

Comments
 (0)