Skip to content

Commit 1f2ec71

Browse files
committed
Further menu improvements
1 parent 5ec65fb commit 1f2ec71

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

toolkit/themes/shared/menu-shared.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ menuitem {
108108
text-shadow: none;
109109
}
110110

111-
@media (-moz-windows-non-native-menus) {
112111
&:where([_moz-menuactive]:not([disabled="true"])) {
113112
color: -moz-menuhovertext;
114113
background-color: -moz-menuhover;
@@ -118,7 +117,6 @@ menuitem {
118117
background-color: -moz-menuhoverdisabled;
119118
}
120119
}
121-
}
122120

123121
@media (-moz-windows-classic) {
124122
menu[disabled="true"],

toolkit/themes/shared/menulist-shared.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,15 @@
5151
dropmarker {
5252
pointer-events: none;
5353
flex: 0;
54-
align-self: center;
5554
}
5655

5756
dropmarker:not([native]) {
5857
display: flex;
5958
appearance: none;
60-
}
61-
62-
dropmarker:not([native])::part(icon) {
6359
content: url(chrome://global/skin/icons/arrow-down-12.svg);
6460
-moz-context-properties: fill;
6561
fill: currentColor;
62+
align-self: center;
6663
}
6764

6865
#highlightable-label:not([highlightable="true"]),

toolkit/themes/shared/popup.css

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ panel {
4545
@media (-moz-platform: linux) or (-moz-platform: windows) {
4646
/* To account for the box-shadow below */
4747
--panel-shadow-margin: 4px;
48+
49+
@media not (-moz-windows-non-native-menus) {
50+
--panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
51+
-moz-window-input-region-margin: var(--panel-shadow-margin);
52+
margin: calc(-1 * var(--panel-shadow-margin));
53+
}
4854
}
4955

5056
/* On some linux WMs we need to draw square menus because alpha is not available */
@@ -97,9 +103,8 @@ panel {
97103

98104
menupopup {
99105
/* Also apply the padding in the inline axis for menus */
106+
@media (-moz-windows-non-native-menus) or (-moz-platform: linux) {
100107
--panel-padding: var(--panel-padding-block);
101-
102-
@media (-moz-windows-non-native-menus) {
103108
@media (-moz-platform: windows) {
104109
> menu,
105110
> menuitem {
@@ -227,6 +232,14 @@ panel:where([type="arrow"]) {
227232
}
228233
}
229234

235+
@media (-moz-platform: windows) {
236+
menulist > menupopup {
237+
appearance: none;
238+
background-color: transparent;
239+
border: none;
240+
}
241+
}
242+
230243
@media not (-moz-windows-non-native-menus) {
231244
/* For Win10, the popup itself needs to have a transparent background because
232245
otherwise the background color would appear behind the drop shadow. */

0 commit comments

Comments
 (0)