Compare commits

...

6 commits

Author SHA1 Message Date
github-actions[bot]
1878f86837
Merge master into proton-style
Some checks failed
CI / build (push) Has been cancelled
2025-07-06 23:51:50 +00:00
alstjr7375
911c3f524b Fix: Icons - context menu overlap in linux #1099
Some checks failed
CI / build (push) Has been cancelled
2025-06-30 00:39:30 +09:00
alstjr7375
42a6a09f32 Fix: Global Menubar - Padding at windows #1103
Some checks failed
CI / build (push) Has been cancelled
2025-06-04 00:00:00 +09:00
alstjr7375
bfc9d9435d Fix: TitleBar - Remove native titlebar button style at linux
Some checks are pending
CI / build (push) Waiting to run
The title bar is not visible in v140
5ce8bb770f
2025-06-04 00:00:00 +09:00
alstjr7375
1d535c5ad3 Fix: Global Menu - menu text selector 2025-06-03 00:00:00 +09:00
alstjr7375
5c818fc1cb Fix: Context menu - transparent background color at hover #1102 2025-06-02 00:00:00 +09:00
12 changed files with 179 additions and 163 deletions

134
css/leptonChrome.css generated
View file

@ -250,28 +250,6 @@
color: inherit !important; /* Original: -moz-menubarhovertext */
background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
}
/*= Linux - Titlebar button at lwtheme =====================================*/
@media not -moz-pref("userChrome.compatibility.os.linux_non_native_titlebar_button") {
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button {
appearance: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button > .toolbarbutton-icon {
appearance: auto !important;
width: unset !important;
height: unset !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-min,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-max,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-restore,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-close {
list-style-image: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button:hover:active {
background-color: unset !important;
color: unset !important;
}
}
}
/*= Linux - Light System Default Theme's Selected Tab ========================*/
@media (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
@ -1248,8 +1226,11 @@
width: unset !important;
}
.menu-iconic-left .menu-iconic-icon,
.menu-iconic-left .menu-icon,
menuitem[type="checkbox"] .menu-iconic-icon,
menuitem[type="radio"] .menu-iconic-icon {
menuitem[type="checkbox"] .menu-icon,
menuitem[type="radio"] .menu-iconic-icon,
menuitem[type="radio"] .menu-icon {
appearance: none !important;
}
}
@ -1278,7 +1259,8 @@
}
}
@media (-moz-gtk-csd-available) {
menuitem[checked="true"] > .menu-iconic-left {
menuitem[checked="true"] > .menu-iconic-left,
menuitem[checked="true"] > .menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
fill-opacity: var(--menu-icon-opacity) !important;
@ -1308,7 +1290,7 @@
@media (-moz-gtk-csd-available) {
menupopup {
/* Disable the default appearance so we can override the native styling. */
appearance: none !important !important;
appearance: none !important;
/* Prevent any background or border around the outside of the shadow. */
background-color: transparent !important;
border: none !important;
@ -1391,13 +1373,15 @@
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left {
#context-navigation > .menuitem-iconic > .menu-iconic-left,
#context-navigation > .menuitem-iconic > .menu-icon {
margin: 0 !important;
padding: 0 !important;
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic > .menu-icon {
width: var(--menuitem-min-width) !important;
height: 32px !important;
padding: 8px 1em !important;
@ -1405,7 +1389,8 @@
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
}
@ -1413,7 +1398,8 @@
#context-navigation
> .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
background-color: transparent !important;
}
}
@ -1920,7 +1906,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -1967,7 +1952,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -3274,7 +3258,7 @@
}
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -3304,7 +3288,7 @@
background-color: var(--organizer-selected-background) !important;
color: var(--organizer-selected-color) !important;
}
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -12050,7 +12034,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
#main-menubar > menu {
-moz-appearance: none !important; /* Linux: menulist */
}
@ -12223,6 +12209,17 @@
#main-menubar > menu menupopup {
--menuitem-image: none; /* Prevent Image Inheritance */
}
@media (-moz-platform: windows) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
transform: translateY(-1px) !important; /* Fix menu top padding position */
padding-inline-start: 0.3em !important;
}
}
@media (-moz-gtk-csd-available) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
padding-inline-start: 3px;
}
}
@media not -moz-pref("userChrome.padding.global_menubar") {
#main-menubar > menu {
padding-block: 2px !important;
@ -12390,8 +12387,8 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
#main-menubar > menu > .menubar-text {
padding-inline-start: 3px;
.menu-icon {
display: unset !important;
}
}
/* Padding - Mac */
@ -14419,28 +14416,6 @@
color: inherit !important; /* Original: -moz-menubarhovertext */
background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
}
/*= Linux - Titlebar button at lwtheme =====================================*/
}
@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.compatibility.os.linux_non_native_titlebar_button")) {
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button {
appearance: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button > .toolbarbutton-icon {
appearance: auto !important;
width: unset !important;
height: unset !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-min,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-max,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-restore,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-close {
list-style-image: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button:hover:active {
background-color: unset !important;
color: unset !important;
}
}
@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
/* Because of
@ -15416,8 +15391,11 @@
width: unset !important;
}
.menu-iconic-left .menu-iconic-icon,
.menu-iconic-left .menu-icon,
menuitem[type="checkbox"] .menu-iconic-icon,
menuitem[type="radio"] .menu-iconic-icon {
menuitem[type="checkbox"] .menu-icon,
menuitem[type="radio"] .menu-iconic-icon,
menuitem[type="radio"] .menu-icon {
appearance: none !important;
}
}
@ -15446,7 +15424,8 @@
}
}
@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
menuitem[checked="true"] > .menu-iconic-left {
menuitem[checked="true"] > .menu-iconic-left,
menuitem[checked="true"] > .menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
fill-opacity: var(--menu-icon-opacity) !important;
@ -15476,7 +15455,7 @@
@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
menupopup {
/* Disable the default appearance so we can override the native styling. */
appearance: none !important !important;
appearance: none !important;
/* Prevent any background or border around the outside of the shadow. */
background-color: transparent !important;
border: none !important;
@ -15559,13 +15538,15 @@
}
}
@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left {
#context-navigation > .menuitem-iconic > .menu-iconic-left,
#context-navigation > .menuitem-iconic > .menu-icon {
margin: 0 !important;
padding: 0 !important;
}
}
@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic > .menu-icon {
width: var(--menuitem-min-width) !important;
height: 32px !important;
padding: 8px 1em !important;
@ -15573,7 +15554,8 @@
}
}
@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
}
@ -15581,7 +15563,8 @@
#context-navigation
> .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
background-color: transparent !important;
}
}
@ -16090,7 +16073,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -16136,7 +16118,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -17491,7 +17472,7 @@
@media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -17529,7 +17510,7 @@
}
}
@media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -27584,7 +27565,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
#main-menubar > menu {
-moz-appearance: none !important; /* Linux: menulist */
}
@ -27779,6 +27762,17 @@
--menuitem-image: none; /* Prevent Image Inheritance */
}
}
@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-platform: windows) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
transform: translateY(-1px) !important; /* Fix menu top padding position */
padding-inline-start: 0.3em !important;
}
}
@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-gtk-csd-available) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
padding-inline-start: 3px;
}
}
@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (not (-moz-bool-pref: "userChrome.padding.global_menubar")) {
#main-menubar > menu {
padding-block: 2px !important;
@ -27933,8 +27927,8 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
#main-menubar > menu > .menubar-text {
padding-inline-start: 3px;
.menu-icon {
display: unset !important;
}
}
@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {

View file

@ -379,28 +379,6 @@
color: inherit !important; /* Original: -moz-menubarhovertext */
background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
}
/*= Linux - Titlebar button at lwtheme =====================================*/
@supports not -moz-bool-pref("userChrome.compatibility.os.linux_non_native_titlebar_button") {
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button {
appearance: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button > .toolbarbutton-icon {
appearance: auto !important;
width: unset !important;
height: unset !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-min,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-max,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-restore,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-close {
list-style-image: none !important;
}
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button,
:root:is(:-moz-lwtheme, [lwtheme]) .titlebar-button:hover:active {
background-color: unset !important;
color: unset !important;
}
}
}
/*= Linux - Light System Default Theme's Selected Tab ========================*/
@media (-moz-gtk-csd-available) and (-moz-toolbar-prefers-color-scheme: light),
@ -1471,8 +1449,11 @@
width: unset !important;
}
.menu-iconic-left .menu-iconic-icon,
.menu-iconic-left .menu-icon,
menuitem[type="checkbox"] .menu-iconic-icon,
menuitem[type="radio"] .menu-iconic-icon {
menuitem[type="checkbox"] .menu-icon,
menuitem[type="radio"] .menu-iconic-icon,
menuitem[type="radio"] .menu-icon {
appearance: none !important;
}
}
@ -1501,7 +1482,8 @@
}
}
@media (-moz-gtk-csd-available) {
menuitem[checked="true"] > .menu-iconic-left {
menuitem[checked="true"] > .menu-iconic-left,
menuitem[checked="true"] > .menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
fill-opacity: var(--menu-icon-opacity) !important;
@ -1531,7 +1513,7 @@
@media (-moz-gtk-csd-available) {
menupopup {
/* Disable the default appearance so we can override the native styling. */
appearance: none !important !important;
appearance: none !important;
/* Prevent any background or border around the outside of the shadow. */
background-color: transparent !important;
border: none !important;
@ -1614,13 +1596,15 @@
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left {
#context-navigation > .menuitem-iconic > .menu-iconic-left,
#context-navigation > .menuitem-iconic > .menu-icon {
margin: 0 !important;
padding: 0 !important;
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic > .menu-icon {
width: var(--menuitem-min-width) !important;
height: 32px !important;
padding: 8px 1em !important;
@ -1628,7 +1612,8 @@
}
}
@media (-moz-gtk-csd-available) {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
}
@ -1636,7 +1621,8 @@
#context-navigation
> .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
background-color: transparent !important;
}
}
@ -2145,7 +2131,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -2193,7 +2178,6 @@
> .menu-iconic-icon {
background-color: var(--menuitem-hover-background-color) !important;
}
html#main-window menupopup #context-navigation > .menuitem-iconic[_moz-menuactive="true"],
html#main-window
menupopup
#context-navigation
@ -3594,7 +3578,7 @@
}
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -3624,7 +3608,7 @@
background-color: var(--organizer-selected-background) !important;
color: var(--organizer-selected-color) !important;
}
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -12532,7 +12516,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
#main-menubar > menu {
-moz-appearance: none !important; /* Linux: menulist */
}
@ -12705,6 +12691,20 @@
#main-menubar > menu menupopup {
--menuitem-image: none; /* Prevent Image Inheritance */
}
@media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
transform: translateY(-1px) !important; /* Fix menu top padding position */
padding-inline-start: 0.3em !important;
}
}
@media (-moz-gtk-csd-available) {
#main-menubar > menu > :is(.menubar-text, .menu-text) {
padding-inline-start: 3px;
}
}
@supports not -moz-bool-pref("userChrome.padding.global_menubar") {
#main-menubar > menu {
padding-block: 2px !important;
@ -13053,8 +13053,8 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
#main-menubar > menu > .menubar-text {
padding-inline-start: 3px;
.menu-icon {
display: unset !important;
}
}
/* Padding - Mac */

42
css/leptonContent.css generated
View file

@ -2597,7 +2597,7 @@
}
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -2627,7 +2627,7 @@
background-color: var(--organizer-selected-background) !important;
color: var(--organizer-selected-color) !important;
}
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -3318,7 +3318,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon {
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon {
-moz-appearance: none !important; /* Linux: menulist */
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
@ -3434,6 +3436,9 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
.menu-icon {
display: unset !important;
}
/* Contextmenu Checkbox Unset */
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
margin-inline: 0 !important;
@ -3441,13 +3446,19 @@
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-icon {
margin-inline-end: 0 !important;
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-icon {
border: none !important;
background-color: unset !important;
}
@ -6377,7 +6388,7 @@
@media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -6415,7 +6426,7 @@
}
}
@media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -7165,7 +7176,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon {
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon {
-moz-appearance: none !important; /* Linux: menulist */
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
@ -7277,6 +7290,9 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
.menu-icon {
display: unset !important;
}
/* Contextmenu Checkbox Unset */
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
margin-inline: 0 !important;
@ -7284,13 +7300,19 @@
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-icon {
margin-inline-end: 0 !important;
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-icon {
border: none !important;
background-color: unset !important;
}

View file

@ -2600,7 +2600,7 @@
}
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -2630,7 +2630,7 @@
background-color: var(--organizer-selected-background) !important;
color: var(--organizer-selected-color) !important;
}
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}
@ -3321,7 +3321,9 @@
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon {
menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon {
-moz-appearance: none !important; /* Linux: menulist */
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
@ -3573,6 +3575,9 @@
--context-menu-background-padding-default: 6px;
--context-menu-text-padding: 21px;
}
.menu-icon {
display: unset !important;
}
/* Contextmenu Checkbox Unset */
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
margin-inline: 0 !important;
@ -3580,13 +3585,19 @@
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]
> .menu-icon {
margin-inline-end: 0 !important;
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-iconic-left
> .menu-iconic-icon {
> .menu-iconic-icon,
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem[type="checkbox"]:not([checked="true"])
> .menu-icon {
border: none !important;
background-color: unset !important;
}

View file

@ -167,31 +167,6 @@
color: inherit !important; /* Original: -moz-menubarhovertext */
background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
}
/*= Linux - Titlebar button at lwtheme =====================================*/
@include NotOption("userChrome.compatibility.os.linux_non_native_titlebar_button") {
@include lwtheme {
.titlebar-button {
appearance: none !important;
> .toolbarbutton-icon {
appearance: auto !important;
width: unset !important;
height: unset !important;
}
}
.titlebar-min,
.titlebar-max,
.titlebar-restore,
.titlebar-close {
list-style-image: none !important;
}
.titlebar-button,
.titlebar-button:hover:active {
background-color: unset !important;
color: unset !important;
}
}
}
}
/*= Linux - Light System Default Theme's Selected Tab ========================*/

View file

@ -81,6 +81,15 @@ $_layoutCommonMenus: (
menupopup {
--menuitem-image: none; /* Prevent Image Inheritance */
}
& > :is(.menubar-text, .menu-text) {
@include OS($win) {
transform: translateY(-1px) !important; /* Fix menu top padding position */
padding-inline-start: 0.3em !important;
}
@include OS($linux) {
@include _layout_init_linux;
}
}
@include NotOption("userChrome.padding.global_menubar") {
padding-block: 2px !important;
}
@ -113,10 +122,6 @@ $_layoutCommonMenus: (
/* Padding - Linux */
@include OS($linux) {
@include _layout_root_linux;
#{$_globalMenus} > .menubar-text {
@include _layout_init_linux;
}
}
/* Padding - Mac */

View file

@ -41,7 +41,7 @@ $_initialMenus: selector.append(
$_checkMenu
);
$_initialMenus: $_initialMenus + "," +
selector.nest($_initialMenus, "> .menu-iconic-left > .menu-iconic-icon");
selector.nest($_initialMenus, "> .menu-iconic-left > .menu-iconic-icon, > .menu-icon");
@mixin _initial_menus() {
-moz-appearance: none !important; /* Linux: menulist */
}
@ -192,6 +192,9 @@ $_initialMenus: $_initialMenus + "," +
// https://github.com/mozilla/gecko-dev/blob/e54707888510dec75db59a170b287d1db031505a/toolkit/themes/linux/global/menu.css#L103
--context-menu-text-padding: 21px;
}
.menu-icon {
display: unset !important;
}
}
@mixin _layout_init_linux() {
padding-inline-start: 3px;

View file

@ -61,10 +61,12 @@ $_placesPopupSetMenus: selector.nest(
/* Contextmenu Checkbox Unset */
#{$_placesPopupSet} menuitem[type="checkbox"] {
margin-inline: 0 !important;
> .menu-iconic-left > .menu-iconic-icon {
> .menu-iconic-left > .menu-iconic-icon,
> .menu-icon {
margin-inline-end: 0 !important;
}
&:not([checked="true"]) > .menu-iconic-left > .menu-iconic-icon {
&:not([checked="true"]) > .menu-iconic-left > .menu-iconic-icon,
&:not([checked="true"]) > .menu-icon {
border: none !important;
background-color: unset !important;
}

View file

@ -101,7 +101,7 @@
#placesToolbar > toolbarbutton > .toolbarbutton-icon,
#placesMenu > menu > image,
#placesMenu > menu > .menubar-text {
#placesMenu > menu > :is(.menubar-text, .menu-text) {
-moz-context-properties: fill !important;
fill: currentColor !important;
}
@ -131,7 +131,7 @@
background-color: var(--organizer-selected-background) !important;
color: var(--organizer-selected-color) !important;
}
> .menubar-text {
> :is(.menubar-text, .menu-text) {
margin-block: 0 !important; /* override menu.css */
padding-inline-end: 4px !important;
}

View file

@ -57,7 +57,6 @@ html#main-window menupopup:not(.in-menulist) {
background-color: var(--menuitem-hover-background-color) !important;
}
&,
&[disabled="true"] > .menu-iconic-left > .menu-iconic-icon {
background-color: transparent !important;
}

View file

@ -100,7 +100,8 @@
menuitem[type="radio"] {
appearance: none !important; /* to override more specific selectors above. */
width: unset !important;
.menu-iconic-icon {
.menu-iconic-icon,
.menu-icon {
appearance: none !important;
}
}
@ -128,7 +129,8 @@
checkboxes and radio buttons because the native drawing we use on other
Windows versions looks pretty bad with the Win10 styles, so for now we'll
insert a generic checkmark icon for both types. */
menuitem[checked="true"] > .menu-iconic-left {
menuitem[checked="true"] > .menu-iconic-left,
menuitem[checked="true"] > .menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
fill-opacity: var(--menu-icon-opacity) !important;
@ -157,7 +159,7 @@
//-- Global - Menu Popup -----------------------------------------------------
menupopup {
/* Disable the default appearance so we can override the native styling. */
appearance: none !important !important;
appearance: none !important;
/* Prevent any background or border around the outside of the shadow. */
background-color: transparent !important;
@ -233,23 +235,27 @@
background-color: transparent !important;
}
#context-navigation > .menuitem-iconic > .menu-iconic-left {
#context-navigation > .menuitem-iconic > .menu-iconic-left,
#context-navigation > .menuitem-iconic > .menu-icon {
margin: 0 !important;
padding: 0 !important;
}
/* override styles from shared/contextmenu.inc.css */
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic > .menu-icon {
width: var(--menuitem-min-width) !important;
height: 32px !important;
padding: 8px 1em !important;
margin: 0 !important;
}
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
background-color: var(--menuitem-hover-background-color) !important; // -moz-menuhover
}
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-iconic-left > .menu-iconic-icon {
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-iconic-left > .menu-iconic-icon,
#context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
background-color: transparent !important;// -moz-menuhoverdisabled
}

View file

@ -57,7 +57,6 @@ user_pref("userChrome.rounding.square_tab", false);
// user_pref("userChrome.compatibility.navbar_top_border", true);
// user_pref("userChrome.compatibility.dynamic_separator", true); // Need dynamic_separator
// user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true);
// user_pref("userChrome.compatibility.os.windows_maximized", true);
// user_pref("userChrome.compatibility.os.win11", true);