From 435fa989aa299ae417d84752e9a4b7b2774786e7 Mon Sep 17 00:00:00 2001 From: BPower0036 <80090789+BPower0036@users.noreply.github.com> Date: Tue, 26 Apr 2022 18:56:11 +0000 Subject: [PATCH 1/5] https://github.com/black7375/Firefox-UI-Fix/issues/349 --- src/icons/_layout_menu.scss | 55 ++++++++++++++----------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss index ba14f049..f9cd4071 100644 --- a/src/icons/_layout_menu.scss +++ b/src/icons/_layout_menu.scss @@ -7,15 +7,15 @@ menupopup menu:not([type="checkbox"], [type="radio"]), /* Icon */ :not(menu, #ContentSelectDropdown) > menupopup - > menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menuitem:not(.menuitem-iconic, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown) > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), #main-menubar > menu, menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menuitem:not(.menuitem-iconic, .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, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -35,10 +35,10 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) @supports -moz-bool-pref("widget.macos.native-context-menus") { :not(menu, #ContentSelectDropdown) > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menuitem:not(.menuitem-iconic, [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown) > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { + > menu:not(.menu-iconic, [checked="true"], .in-menulist) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } @@ -51,9 +51,9 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item), + menuitem:not(.menuitem-iconic, .in-menulist, [checked="true"], .bookmark-item), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -80,19 +80,6 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) } /* Padding - Windows */ -@include OS($win) { - /* Checkbox */ - :root { - --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); - } - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"][checked="false"] - > .menu-iconic-left { - padding-inline-start: var(--context-menu-text-padding); - } -} - @include OS($win7) { :root { --context-menu-background-padding-default: 2px; @@ -106,14 +93,14 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) @include OS($win7, $win8) { :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menuitem:not(.menuitem-iconic, [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menu:not(.menu-iconic, [checked="true"], .in-menulist), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item), + menuitem:not(.menuitem-iconic, .in-menulist, [checked="true"], .bookmark-item), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -132,14 +119,14 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menuitem:not(.menuitem-iconic, [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menu:not(.menu-iconic, [checked="true"], .in-menulist), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item), + menuitem:not(.menuitem-iconic, .in-menulist, [checked="true"], .bookmark-item), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -171,10 +158,10 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) /* context menu width */ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menuitem:not(.menuitem-iconic, [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menu:not(.menu-iconic, [checked="true"], .in-menulist), #blockedPopupDontShowMessage { padding-inline-end: var(--context-menu-background-padding) !important; } @@ -186,7 +173,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) } /* Checkbox menuitem, None iconic menu */ - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"], + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[checked="true"], :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic) { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } @@ -194,9 +181,9 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) /* 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, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item), + menuitem:not(.menuitem-iconic, .in-menulist, [checked="true"], .bookmark-item), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + menu:not(.menu-iconic, .in-menulist, [checked="true"]) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")); } */ From 9645e4321f69157ecb3e8eb2cfcc9782ba4336e1 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 4 Jun 2022 21:47:53 +0900 Subject: [PATCH 2/5] Fix: Icon - Padding apply at `checkbox` is `false` #349 Co-authored-by: BPower0036 <80090789+BPower0036@users.noreply.github.com> --- css/leptonChrome.css | 70 +++++++++++++------------------------ src/icons/_layout_menu.scss | 34 +++++++++--------- 2 files changed, 42 insertions(+), 62 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index fa721a91..635d46b0 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -5972,8 +5972,8 @@ } /** Menu - Icons Layout *******************************************************/ @supports -moz-bool-pref("userChrome.icon.menu") { - menupopup menuitem:not([type="checkbox"], [type="radio"]), - menupopup menu:not([type="checkbox"], [type="radio"]), + menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), + menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]), #main-menubar > menu { -moz-appearance: none !important; /* Linux: menulist */ @@ -5983,14 +5983,12 @@ #main-menubar > menu, :not(menu, #ContentSelectDropdown) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), - :not(menu, #ContentSelectDropdown) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > 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) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + 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, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -6009,10 +6007,8 @@ @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { :not(menu, #ContentSelectDropdown) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), - :not(menu, #ContentSelectDropdown) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } @@ -6026,14 +6022,14 @@ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + 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, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -6065,24 +6061,6 @@ } } /* Padding - Windows */ - @media (-moz-os-version: windows-win7), - (-moz-platform: windows-win7), - (-moz-os-version: windows-win8), - (-moz-platform: windows-win8), - (-moz-os-version: windows-win10), - (-moz-platform: windows-win10) { - /* Checkbox */ - :root { - --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); - } - - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"]:not([checked="true"]) - > .menu-iconic-left { - padding-inline-start: var(--context-menu-text-padding); - } - } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { :root { --context-menu-background-padding-default: 2px; @@ -6099,14 +6077,14 @@ (-moz-platform: windows-win8) { :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + 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, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -6128,14 +6106,14 @@ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + 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, [type="checkbox"], [checked="true"]), + menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, @@ -6165,10 +6143,10 @@ /* context menu width */ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [type="checkbox"], [checked="true"]), + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup - > menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), #blockedPopupDontShowMessage { padding-inline-end: var(--context-menu-background-padding) !important; } @@ -6180,14 +6158,14 @@ } /* Checkbox menuitem, None iconic menu */ - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"], + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[checked="true"], :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic) { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } /* 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, [type=checkbox], [checked=true]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [type=checkbox], [checked=true]) { + 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")); } */ diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss index dc84f35e..5ed737cf 100644 --- a/src/icons/_layout_menu.scss +++ b/src/icons/_layout_menu.scss @@ -1,6 +1,6 @@ //-- Mixin --------------------------------------------------------------------- // Items -$_iconNoneCommon: ".in-menulist, [type=\"checkbox\"], [checked=\"true\"]"; +$_iconNoneCommon: ".in-menulist, [checked=\"true\"]"; $_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneCommon})"; $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})"; @@ -57,8 +57,10 @@ $_layoutCommonMenus: ( } //------------------------------------------------------------------------------ -menupopup menuitem:not([type="checkbox"], [type="radio"]), -menupopup menu:not([type="checkbox"], [type="radio"]), +#{selector.append( + "menupopup menuitem, menupopup menu", + ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])" +)}, #{$_globalMenus} { -moz-appearance: none !important; /* Linux: menulist */ } @@ -113,18 +115,18 @@ menupopup menu:not([type="checkbox"], [type="radio"]), } /* Padding - Windows */ -@include OS($win) { - /* Checkbox */ - :root { - --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); - } - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"]:not([checked="true"]) - > .menu-iconic-left { - padding-inline-start: var(--context-menu-text-padding); - } -} +// @include OS($win) { +// /* Checkbox */ +// :root { +// --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); +// } +// :not(menu, #ContentSelectDropdown, #context-navigation) +// > menupopup +// > menuitem[type="checkbox"]:not([checked="true"]) +// > .menu-iconic-left { +// padding-inline-start: var(--context-menu-text-padding); +// } +// } @include OS($win7) { :root { @@ -185,7 +187,7 @@ menupopup menu:not([type="checkbox"], [type="radio"]), } /* Checkbox menuitem, None iconic menu */ - #{selector.nest($_nestedPopupPadding, "menuitem[type=\"checkbox\"], menu:not(.menu-iconic)")} { + #{selector.nest($_nestedPopupPadding, "menuitem[checked=\"true\"], menu:not(.menu-iconic)")} { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } From 2e6532887b1af94a40c8c774b3300ef10b24ceb3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 4 Jun 2022 23:15:01 +0900 Subject: [PATCH 3/5] Add: Icons- enable existed icons --- css/leptonChrome.css | 34 ++++++++++++++++++----- css/leptonContent.css | 2 +- src/icons/_global_menu.scss | 5 ++++ src/icons/_panel.scss | 2 +- src/icons/context_menu/_content_area.scss | 8 +++--- src/icons/context_menu/_place.scss | 2 +- src/icons/context_menu/_tab_toolbar.scss | 2 +- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 635d46b0..cb5c80d5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -5771,7 +5771,7 @@ list-style-image: url("../icons/window-dev-tools.svg"); } - /* Browser Content Toolbaox - */ + /* Browser Content Toolbox */ #appmenu-developer-tools-view .subviewbutton:nth-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-child(5) { list-style-image: url("../icons/command-frames.svg"); @@ -6400,7 +6400,7 @@ #toggle_toolbar-menubar { /* checkbox */ - /* --menuitem-image: url("../icons/calendar-agenda.svg"); */ + --menuitem-image: url("../icons/calendar-agenda.svg"); } #toggle_PersonalToolbar { @@ -6419,12 +6419,12 @@ #context-viewsource-wrapLongLines { /* checkbox */ - /* --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); */ + --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); } #context-viewsource-highlightSyntax { /* checkbox */ - /* --menuitem-image: url("../icons/code.svg"); */ + --menuitem-image: url("../icons/code.svg"); } #spell-no-suggestions { @@ -6509,7 +6509,7 @@ #context-media-loop { /* checkbox */ - /* --menuitem-image: url("../icons/arrow-repeat-all.svg"); */ + --menuitem-image: url("../icons/arrow-repeat-all.svg"); } #context-leave-dom-fullscreen { @@ -6534,7 +6534,7 @@ #context-video-pictureinpicture { /* checkbox */ - /* --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); */ + --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); } #context-reloadimage { @@ -6808,7 +6808,7 @@ #show-other-bookmarks_PersonalToolbar { /* checkbox */ - /* --menuitem-image: url("../icons/star-line-horizontal.svg"); */ + --menuitem-image: url("../icons/star-line-horizontal.svg"); } #placesContext_showAllBookmarks { @@ -7130,6 +7130,10 @@ --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } + #menu_newUserContext { + --menuitem-image: url("../icons/container-openin-16.svg"); + } + #menu_newNavigator { --menuitem-image: url("chrome://browser/skin/window.svg"); } @@ -7268,6 +7272,10 @@ --menuitem-image: url("../icons/restore-session.svg"); } + #hiddenTabsMenu { + --menuitem-image: url("../icons/eye-hide.svg"); + } + #historyUndoMenu { --menuitem-image: url("chrome://browser/skin/tab.svg"); } @@ -7326,6 +7334,10 @@ } /* menuWebDeveloperPopup sub menu */ + #menu_devToolbox { + --menuitem-image: url("../icons/developer.svg"); + } + #menu_taskManager { --menuitem-image: url("../icons/performance.svg"); } @@ -7346,6 +7358,14 @@ --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); } + #menu_responsiveUI { + --menuitem-image: url("../icons/command-responsivemode.svg"); + } + + #menu_eyedropper { + --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + } + #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } diff --git a/css/leptonContent.css b/css/leptonContent.css index 587c725d..8301255a 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2241,7 +2241,7 @@ #show-other-bookmarks_PersonalToolbar { /* checkbox */ - /* --menuitem-image: url("../icons/star-line-horizontal.svg"); */ + --menuitem-image: url("../icons/star-line-horizontal.svg"); } #placesContext_showAllBookmarks { diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 99b12c1e..dc65d828 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -4,6 +4,7 @@ --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } #menu_newUserContext { + --menuitem-image: url("../icons/container-openin-16.svg"); } #menu_newNavigator { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -152,6 +153,7 @@ --menuitem-image: url("../icons/restore-session.svg"); } #hiddenTabsMenu { + --menuitem-image: url("../icons/eye-hide.svg") } #historyUndoMenu { --menuitem-image: url("chrome://browser/skin/tab.svg"); @@ -220,6 +222,7 @@ #enableDeveloperTools { } #menu_devToolbox { + --menuitem-image: url("../icons/developer.svg"); } #menu_taskManager { --menuitem-image: url("../icons/performance.svg"); @@ -237,8 +240,10 @@ --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); } #menu_responsiveUI { + --menuitem-image: url("../icons/command-responsivemode.svg"); } #menu_eyedropper { + --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index a299aa49..d4290b6b 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -278,7 +278,7 @@ panelMenuBookmarkThisPage[starred] { #PanelUI-developer-tools-view .subviewbutton:nth-child(4) { list-style-image: url("../icons/window-dev-tools.svg"); } -/* Browser Content Toolbaox - */ +/* Browser Content Toolbox */ #appmenu-developer-tools-view .subviewbutton:nth-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-child(5) { list-style-image: url("../icons/command-frames.svg"); diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 01580aa6..f0118bee 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -4,12 +4,12 @@ } #context-viewsource-wrapLongLines { /* checkbox */ - /* --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); */ + --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); } #context-viewsource-highlightSyntax { /* checkbox */ - /* --menuitem-image: url("../icons/code.svg"); */ + --menuitem-image: url("../icons/code.svg"); } #spell-no-suggestions { @@ -77,7 +77,7 @@ } #context-media-loop { /* checkbox */ - /* --menuitem-image: url("../icons/arrow-repeat-all.svg"); */ + --menuitem-image: url("../icons/arrow-repeat-all.svg"); } #context-leave-dom-fullscreen { --menuitem-image: url("chrome://global/skin/media/fullscreenExitButton.svg"); @@ -97,7 +97,7 @@ } #context-video-pictureinpicture { /* checkbox */ - /* --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); */ + --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); } #context-reloadimage { diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss index 6310fa21..cef867ec 100644 --- a/src/icons/context_menu/_place.scss +++ b/src/icons/context_menu/_place.scss @@ -68,7 +68,7 @@ } #show-other-bookmarks_PersonalToolbar { /* checkbox */ - /* --menuitem-image: url("../icons/star-line-horizontal.svg"); */ + --menuitem-image: url("../icons/star-line-horizontal.svg"); } #placesContext_showAllBookmarks { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 112584f0..b38ec744 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -112,7 +112,7 @@ #toggle_toolbar-menubar { /* checkbox */ - /* --menuitem-image: url("../icons/calendar-agenda.svg"); */ + --menuitem-image: url("../icons/calendar-agenda.svg"); } #toggle_PersonalToolbar { /* Also placeContext */ From 05295e88152deddc4fcbb9330cde972638b1d0a6 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Jun 2022 03:14:51 +0900 Subject: [PATCH 4/5] Fix: Icons - Set spell check & show all tab icon, checkbox menu comments --- css/leptonChrome.css | 17 +++++++++++++++++ src/icons/_global_menu.scss | 8 +++++++- src/icons/context_menu/_content_area.scss | 1 + src/icons/context_menu/_others.scss | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index cb5c80d5..33e167f9 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6668,6 +6668,7 @@ #spell-check-enabled { /* checkbox */ + --menuitem-image: url("../icons/text-proofing-tools.svg"); } #spell-add-dictionaries-main { @@ -6905,6 +6906,10 @@ /* checkbox */ } + .downloadAlwaysOpenSimilarFilesMenuItem { + /* checkbox */ + } + .downloadShowMenuItem { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -7162,6 +7167,10 @@ --menuitem-image: url("chrome://browser/skin/import.svg"); } + #goOfflineMenuitem { + /* checkbox */ + } + #menu_FileQuitItem { --menuitem-image: url("../icons/quit.svg"); } @@ -7226,6 +7235,7 @@ } #fullScreenItem { + /* checkbox */ --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); } @@ -7233,6 +7243,10 @@ --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } + #menu_showAllTabs { + --menuitem-image: url("../icons/tab.svg"); + } + #documentDirection-swap { --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg"); } @@ -7335,6 +7349,7 @@ /* menuWebDeveloperPopup sub menu */ #menu_devToolbox { + /* checkbox */ --menuitem-image: url("../icons/developer.svg"); } @@ -7359,10 +7374,12 @@ } #menu_responsiveUI { + /* checkbox */ --menuitem-image: url("../icons/command-responsivemode.svg"); } #menu_eyedropper { + /* checkbox */ --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); } diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index dc65d828..864c472d 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -44,6 +44,7 @@ } #goOfflineMenuitem { + /* checkbox */ } #menu_FileQuitItem { --menuitem-image: url("../icons/quit.svg"); @@ -110,12 +111,14 @@ } #fullScreenItem { + /* checkbox */ --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); } #menu_readerModeItem { --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } #menu_showAllTabs { + --menuitem-image: url("../icons/tab.svg"); } #documentDirection-swap { @@ -211,7 +214,7 @@ } #webDeveloperMenu, /* Legacy */ - #browserToolsMenu { +#browserToolsMenu { --menuitem-image: url("../icons/developer.svg"); } #menu_pageInfo { @@ -222,6 +225,7 @@ #enableDeveloperTools { } #menu_devToolbox { + /* checkbox */ --menuitem-image: url("../icons/developer.svg"); } #menu_taskManager { @@ -240,9 +244,11 @@ --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); } #menu_responsiveUI { + /* checkbox */ --menuitem-image: url("../icons/command-responsivemode.svg"); } #menu_eyedropper { + /* checkbox */ --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); } #menu_pageSource { diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index f0118bee..43cc7a29 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -209,6 +209,7 @@ #spell-check-enabled { /* checkbox */ + --menuitem-image: url("../icons/text-proofing-tools.svg"); } #spell-add-dictionaries-main { --menuitem-image: url("../icons/book-add.svg"); diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 36973e72..4b8aefe7 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -74,6 +74,9 @@ .downloadAlwaysUseSystemDefaultMenuItem { /* checkbox */ } +.downloadAlwaysOpenSimilarFilesMenuItem { + /* checkbox */ +} .downloadShowMenuItem { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); @include Option("userChrome.icon.library") { From b3bd442225a19ead48ee3bff4408dcc13e208030 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Jun 2022 20:27:11 +0900 Subject: [PATCH 5/5] Add: Icons - Non existed checkbox menus' icons --- css/leptonChrome.css | 17 ++++++++++++++--- icons/drawer-arrow-download.svg | 3 +++ icons/eye-tracking-off.svg | 3 +++ icons/fluid.svg | 3 +++ icons/folder-globe.svg | 3 +++ icons/plug-disconnected.svg | 3 +++ src/icons/_global_menu.scss | 1 + src/icons/_panel.scss | 2 +- src/icons/context_menu/_others.scss | 4 ++++ src/icons/context_menu/_tab_toolbar.scss | 10 ++++++++-- 10 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 icons/drawer-arrow-download.svg create mode 100644 icons/eye-tracking-off.svg create mode 100644 icons/fluid.svg create mode 100644 icons/folder-globe.svg create mode 100644 icons/plug-disconnected.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 33e167f9..143640b5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -5881,7 +5881,7 @@ } #allTabsMenu-hiddenTabsButton { - list-style-image: url("../icons/password-hide.svg"); + list-style-image: url("../icons/eye-hide.svg"); } #allTabsMenu-containerTabsView .subviewbutton:last-child { @@ -6368,14 +6368,20 @@ --menuitem-image: url("chrome://browser/skin/pin-12.svg"); } - .toolbar-context-autohide-downloads-button { - --menuitem-image: url("../icons/password-hide.svg"); + #toolbar-context-autohide-downloads-button { + /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } .customize-context-removeFromToolbar { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #toolbar-context-always-open-downloads-panel { + /* checkbox */ + --menuitem-image: url("../icons/drawer-arrow-download.svg"); + } + #toolbar-context-openANewTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } @@ -6837,6 +6843,7 @@ /*= autohide-context =========================================================*/ #autohide-context > menuitem[data-l10n-id="full-screen-autohide"] { /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } #autohide-context > menuitem[data-l10n-id="full-screen-exit"] { @@ -6883,6 +6890,7 @@ /*= downloads-button-autohide-panel ==========================================*/ #downloads-button-autohide-checkbox { /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } /*= downloadsContextMenu =====================================================*/ @@ -6904,10 +6912,12 @@ .downloadAlwaysUseSystemDefaultMenuItem { /* checkbox */ + --menuitem-image: url("../icons/folder-globe.svg"); } .downloadAlwaysOpenSimilarFilesMenuItem { /* checkbox */ + --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { @@ -7169,6 +7179,7 @@ #goOfflineMenuitem { /* checkbox */ + --menuitem-image: url("../icons/plug-disconnected.svg"); } #menu_FileQuitItem { diff --git a/icons/drawer-arrow-download.svg b/icons/drawer-arrow-download.svg new file mode 100644 index 00000000..50060f13 --- /dev/null +++ b/icons/drawer-arrow-download.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/eye-tracking-off.svg b/icons/eye-tracking-off.svg new file mode 100644 index 00000000..9ce8bbf9 --- /dev/null +++ b/icons/eye-tracking-off.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/fluid.svg b/icons/fluid.svg new file mode 100644 index 00000000..2cffb706 --- /dev/null +++ b/icons/fluid.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/folder-globe.svg b/icons/folder-globe.svg new file mode 100644 index 00000000..65eb7e09 --- /dev/null +++ b/icons/folder-globe.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/plug-disconnected.svg b/icons/plug-disconnected.svg new file mode 100644 index 00000000..4d978ab7 --- /dev/null +++ b/icons/plug-disconnected.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 864c472d..805f69d8 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -45,6 +45,7 @@ #goOfflineMenuitem { /* checkbox */ + --menuitem-image: url("../icons/plug-disconnected.svg"); } #menu_FileQuitItem { --menuitem-image: url("../icons/quit.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index d4290b6b..5ac61352 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -371,7 +371,7 @@ panelMenuBookmarkThisPage[starred] { } #allTabsMenu-hiddenTabsButton { - list-style-image: url("../icons/password-hide.svg"); + list-style-image: url("../icons/eye-hide.svg") } #allTabsMenu-containerTabsView .subviewbutton:last-child { diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 4b8aefe7..b04b213b 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -13,6 +13,7 @@ /*= autohide-context =========================================================*/ #autohide-context > menuitem[data-l10n-id="full-screen-autohide"] { /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } #autohide-context > menuitem[data-l10n-id="full-screen-exit"] { @@ -56,6 +57,7 @@ /*= downloads-button-autohide-panel ==========================================*/ #downloads-button-autohide-checkbox { /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } /*= downloadsContextMenu =====================================================*/ @@ -73,9 +75,11 @@ } .downloadAlwaysUseSystemDefaultMenuItem { /* checkbox */ + --menuitem-image: url("../icons/folder-globe.svg"); } .downloadAlwaysOpenSimilarFilesMenuItem { /* checkbox */ + --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index b38ec744..00d03729 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -85,12 +85,18 @@ .customize-context-moveToPanel { --menuitem-image: url("chrome://browser/skin/pin-12.svg"); } -.toolbar-context-autohide-downloads-button { - --menuitem-image: url("../icons/password-hide.svg"); +#toolbar-context-autohide-downloads-button { + /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); } .customize-context-removeFromToolbar { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + +#toolbar-context-always-open-downloads-panel { + /* checkbox */ + --menuitem-image: url("../icons/drawer-arrow-download.svg"); +} #toolbar-context-openANewTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); }