diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 98e4f1a..7771e78 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6043,9 +6043,9 @@
> menupopup
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
:not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -6088,9 +6088,9 @@
:not(menu, #ContentSelectDropdown, #context-navigation)
> menupopup
> menu:not(.menu-iconic, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -6146,9 +6146,9 @@
:not(menu, #ContentSelectDropdown, #context-navigation)
> menupopup
> menu:not(.menu-iconic, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -6178,9 +6178,9 @@
:not(menu, #ContentSelectDropdown, #context-navigation)
> menupopup
> menu:not(.menu-iconic, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -6235,11 +6235,12 @@
}
/* Global Menu */
- /* Disabled. some icons not appear
- menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked=true]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked=true]) {
- list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
- }
- */
+ 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 ===================================================*/
/* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
@@ -7266,6 +7267,10 @@
--menuitem-image: url("chrome://browser/skin/mail.svg");
}
+ menu.share-tab-url-item {
+ --menuitem-image: url("chrome://browser/skin/share.svg");
+ }
+
#menu_print {
--menuitem-image: url("chrome://global/skin/icons/print.svg");
}
@@ -7348,6 +7353,14 @@
--menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
}
+ #enterFullScreenItem {
+ --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+ }
+
+ #exitFullScreenItem {
+ --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+ }
+
#fullScreenItem {
/* checkbox */
--menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -7383,6 +7396,10 @@
--menuitem-image: url("../icons/resize.svg");
}
+ #toggle_zoom {
+ --menuitem-image: url("../icons/screenshot.svg");
+ }
+
/*= goPopup ==================================================================*/
#menu_showAllHistory {
--menuitem-image: url("chrome://browser/skin/history.svg");
@@ -7505,6 +7522,14 @@
--menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg");
}
+ /*= windowPopup ==============================================================*/
+ #windowPopup > menuitem[command="minimizeWindow"] {
+ --menuitem-image: url("../icons/arrow-between-down.svg");
+ }
+ #windowPopup > menuitem[command="zoomWindow"] {
+ --menuitem-image: url("../icons/auto-fit-width.svg");
+ }
+
/*= menu_HelpPopup ===========================================================*/
#menu_openHelp {
--menuitem-image: url("chrome://global/skin/icons/help.svg");
diff --git a/icons/arrow-between-down.svg b/icons/arrow-between-down.svg
new file mode 100644
index 0000000..b15ee77
--- /dev/null
+++ b/icons/arrow-between-down.svg
@@ -0,0 +1,3 @@
+
diff --git a/icons/auto-fit-width.svg b/icons/auto-fit-width.svg
new file mode 100644
index 0000000..6b39ade
--- /dev/null
+++ b/icons/auto-fit-width.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index 00aa9f5..be303a1 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -32,6 +32,9 @@
#menu_sendLink {
--menuitem-image: url("chrome://browser/skin/mail.svg");
}
+menu.share-tab-url-item {
+ --menuitem-image: url("chrome://browser/skin/share.svg");
+}
#menu_printPreview {
}
@@ -114,6 +117,12 @@
--menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
}
+#enterFullScreenItem {
+ --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+}
+#exitFullScreenItem {
+ --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+}
#fullScreenItem {
/* checkbox */
--menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -145,6 +154,10 @@
--menuitem-image: url("../icons/resize.svg");
}
+#toggle_zoom {
+ --menuitem-image: url("../icons/screenshot.svg");
+}
+
/*= goPopup ==================================================================*/
#menu_showAllHistory {
--menuitem-image: url("chrome://browser/skin/history.svg");
@@ -262,6 +275,16 @@
--menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg");
}
+/*= windowPopup ==============================================================*/
+#windowPopup > menuitem {
+ &[command="minimizeWindow"] {
+ --menuitem-image: url("../icons/arrow-between-down.svg");
+ }
+ &[command="zoomWindow"] {
+ --menuitem-image: url("../icons/auto-fit-width.svg");
+ }
+}
+
/*= menu_HelpPopup ===========================================================*/
#menu_openHelp {
--menuitem-image: url("chrome://global/skin/icons/help.svg");
diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss
index fb0be85..a09a6a5 100644
--- a/src/icons/_layout_menu.scss
+++ b/src/icons/_layout_menu.scss
@@ -118,9 +118,7 @@ $_layoutCommonMenus: (
}
/* Global Menu */
- /* Disabled. some icons not appear
- #{$_iconMenuPopupMenus} {
- list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
+ #{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/src/icons/_layout_menu_common.scss b/src/icons/_layout_menu_common.scss
index 3d3a92c..5ed7246 100644
--- a/src/icons/_layout_menu_common.scss
+++ b/src/icons/_layout_menu_common.scss
@@ -10,7 +10,7 @@ $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})";
// Components
$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
-$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)";
+$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)";
$_nestedPopupIconMenus: selector.nest(
$_nestedPopupIcon,