Fix: Option - Mac global menu icon as experimental

black7375 · Jul 24, 2022 · 5c8a0ad · 5c8a0ad
1 parent e99591d
commit 5c8a0ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
@@ -6417,11 +6417,13 @@
     }
 
     /* Global Menu */
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-      menuitem:not(.menuitem-iconic, .bookmark-item),
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-      menu:not(.menu-iconic) {
-      list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
+    @supports -moz-bool-pref("userChrome.icon.global_menu.mac") {
+      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+        menuitem:not(.menuitem-iconic, .bookmark-item),
+      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+        menu:not(.menu-iconic) {
+        list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
+      }
     }
   }
   /*= Bookmark Menu - Layout ===================================================*/

diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss
@@ -118,7 +118,9 @@ $_layoutCommonMenus: (
   }
 
   /* Global Menu */
-  #{selector.nest($_iconMenuPopup, "menuitem:not(.menuitem-iconic, .bookmark-item), menu:not(.menu-iconic)")} {
-    list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
+  @include Option("userChrome.icon.global_menu.mac") {
+    #{selector.nest($_iconMenuPopup, "menuitem:not(.menuitem-iconic, .bookmark-item), menu:not(.menu-iconic)")} {
+      list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
+    }
   }
 }
diff --git a/user.js b/user.js
@@ -113,6 +113,7 @@ user_pref("userChrome.rounding.square_tab",           false);
 // user_pref("userChrome.icon.account_image_to_right",         true);
 // user_pref("userChrome.icon.account_label_to_right",         true);
 // user_pref("userChrome.icon.menu.full",                      true);
+// user_pref("userChrome.icon.global_menu.mac",                true);
 
 // -- User Content -------------------------------------------------------------
 // user_pref("userContent.player.ui.twoline",                  true);