Merge cb891587f8 into bfc9d9435d

Fix: TitleBar - Remove native titlebar button style at linux
The title bar is not visible in v140 5ce8bb770f
2025-12-15 15:20:33 -08:00 · 2025-06-08 07:36:29 +09:00 · 2025-06-04 00:00:00 +09:00 · 2025-06-03 00:00:00 +09:00 · 2025-06-02 00:00:00 +09:00 · 2024-11-28 19:43:32 +00:00
10 changed files with 19 additions and 124 deletions
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@ -252,25 +252,6 @@
    }
    /*= 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 ========================*/
@ -1920,7 +1901,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 +1947,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 +3253,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 +3283,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;
      }
@ -12390,7 +12369,7 @@
        --context-menu-background-padding-default: 6px;
        --context-menu-text-padding: 21px;
      }
-      #main-menubar > menu > .menubar-text {
+      #main-menubar > menu > :is(.menubar-text, .menu-text) {
        padding-inline-start: 3px;
      }
    }
@ -14421,27 +14400,6 @@
  }
  /*= 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
    #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected], [multiselected]) > .tab-stack > .tab-background {
@ -16090,7 +16048,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 +16093,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 +17447,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 +17485,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;
      }
@ -27933,7 +27889,7 @@
    --context-menu-background-padding-default: 6px;
    --context-menu-text-padding: 21px;
  }
-  #main-menubar > menu > .menubar-text {
+  #main-menubar > menu > :is(.menubar-text, .menu-text) {
    padding-inline-start: 3px;
  }
 }
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@ -380,27 +380,6 @@
      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),
@ -2145,7 +2124,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 +2171,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 +3571,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 +3601,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;
      }
@ -13053,7 +13030,7 @@
        --context-menu-background-padding-default: 6px;
        --context-menu-text-padding: 21px;
      }
-      #main-menubar > menu > .menubar-text {
+      #main-menubar > menu > :is(.menubar-text, .menu-text) {
        padding-inline-start: 3px;
      }
    }
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@ -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;
        }
@ -6377,7 +6377,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 +6415,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;
      }
--- a/css/leptonContentESR.css
+++ b/css/leptonContentESR.css
@ -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;
        }
--- a/src/compatibility/_os.scss
+++ b/src/compatibility/_os.scss
@ -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 ========================*/
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@ -114,7 +114,7 @@ $_layoutCommonMenus: (
@include OS($linux) {
  @include _layout_root_linux;

-  #{$_globalMenus} > .menubar-text {
+  #{$_globalMenus} > :is(.menubar-text, .menu-text) {
    @include _layout_init_linux;
  }
 }
--- a/src/library/_proton.scss
+++ b/src/library/_proton.scss
@ -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;
    }
--- a/src/theme/_fully_color.scss
+++ b/src/theme/_fully_color.scss
@ -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;
      }
--- a/user.js
+++ b/user.js
@ -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);

--- a/yarn.lock
+++ b/yarn.lock
@ -1555,7 +1555,7 @@ __metadata:
  languageName: node
  linkType: hard

-"cross-spawn@npm:^7.0.0":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3":
  version: 7.0.6
  resolution: "cross-spawn@npm:7.0.6"
  dependencies:
@ -1566,17 +1566,6 @@ __metadata:
  languageName: node
  linkType: hard

-"cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
-  dependencies:
-    path-key: "npm:^3.1.0"
-    shebang-command: "npm:^2.0.0"
-    which: "npm:^2.0.1"
-  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
-  languageName: node
-  linkType: hard
-
 "css-tree@npm:^2.0.2":
  version: 2.3.1
  resolution: "css-tree@npm:2.3.1"
Author	SHA1	Message	Date
dependabot[bot]	e445de1c2d	Merge `cb891587f8` into `bfc9d9435d`	2025-06-08 07:36:29 +09:00
alstjr7375	bfc9d9435d	Fix: TitleBar - Remove native titlebar button style at linux Some checks are pending CI / build (push) Waiting to run Details 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
dependabot[bot]	cb891587f8	Build(deps): Bump cross-spawn from 7.0.3 to 7.0.6 Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-28 19:43:32 +00:00