diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c1712ef..ce29ebe 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11257,7 +11257,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11269,7 +11270,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11339,7 +11341,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11351,7 +11354,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11430,7 +11434,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11442,7 +11447,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11492,7 +11498,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11504,7 +11511,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11588,7 +11596,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item), menupopup:is( @@ -11600,7 +11609,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; @@ -13036,9 +13046,30 @@ } } @supports -moz-bool-pref("userChrome.icon.menu") { + #toggle_sharemode { + --menuitem-image: url("chrome://branding/content/about-logo-private.png"); + } #usercssloader-menu { --menuitem-image: url("../icons/developer.svg"); } + #usercssloader-menupopup > menu[data-l10n-id="css-menu"] { + --menuitem-image: url("../icons/document-css.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="rebuild-css"] { + --menuitem-image: url("chrome://global/skin/icons/reload.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { + --menuitem-image: url("../icons/folder.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userContentCss-editor"] { + --menuitem-image: url("chrome://global/skin/icons/page-portrait.svg"); + } #toggle_statusBar { --menuitem-image: url("../icons/pulse-square.svg"); } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 5c2fca2..891a65e 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11677,7 +11677,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11689,7 +11690,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11759,7 +11761,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11771,7 +11774,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11853,7 +11857,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11865,7 +11870,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -11922,7 +11928,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -11934,7 +11941,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -12101,7 +12109,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is( @@ -12113,7 +12122,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) @@ -12183,7 +12193,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menuitem:not(.menuitem-iconic, .bookmark-item), menupopup:is( @@ -12195,7 +12206,8 @@ #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, - #menu_HelpPopup + #menu_HelpPopup, + #usercssloader-menupopup ) menu:not(.menu-iconic) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; @@ -13646,9 +13658,30 @@ } } @supports -moz-bool-pref("userChrome.icon.menu") { + #toggle_sharemode { + --menuitem-image: url("chrome://branding/content/about-logo-private.png"); + } #usercssloader-menu { --menuitem-image: url("../icons/developer.svg"); } + #usercssloader-menupopup > menu[data-l10n-id="css-menu"] { + --menuitem-image: url("../icons/document-css.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="rebuild-css"] { + --menuitem-image: url("chrome://global/skin/icons/reload.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { + --menuitem-image: url("../icons/folder.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userContentCss-editor"] { + --menuitem-image: url("chrome://global/skin/icons/page-portrait.svg"); + } #toggle_statusBar { --menuitem-image: url("../icons/pulse-square.svg"); } diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 3e540dd..140427b 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -8,9 +8,40 @@ } } @include Option("userChrome.icon.menu") { + #toggle_sharemode { + --menuitem-image: url("chrome://branding/content/about-logo-private.png"); + } + #usercssloader-menu { --menuitem-image: url("../icons/developer.svg"); } + #usercssloader-menupopup > menu[data-l10n-id="css-menu"] { + --menuitem-image: url("../icons/document-css.svg"); + } + #usercssloader-submenupopup > menuitem { + &[data-l10n-id="rebuild-css"] { + --menuitem-image: url("chrome://global/skin/icons/reload.svg"); + } + + &[data-l10n-id="make-browsercss-file"] { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + &[data-l10n-id="open-css-folder"] { + --menuitem-image: url("../icons/folder.svg"); + } + &[data-l10n-id="edit-userChromeCss-editor"] { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + &[data-l10n-id="edit-userContentCss-editor"] { + --menuitem-image: url("chrome://global/skin/icons/page-portrait.svg"); + } + } + + #context_toggleToPrivateContainer, + #open_in_private_container { + --menuitem-image: url("../icons/private-favicon.svg"); + } + #toggle_statusBar { --menuitem-image: url("../icons/pulse-square.svg"); diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 9c58641..d430609 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -11,7 +11,7 @@ $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})"; $_nestedPopup: "> menupopup:not(.in-menulist) >"; $_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) #{$_nestedPopup}"; $_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) #{$_nestedPopup}"; -$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)"; +$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup, #usercssloader-menupopup)"; $_nestedPopupIconMenus: selector.nest( $_nestedPopupIcon,