From b101d743b42daffc3f3a4af3856fd1edbf4479f3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 9 Jun 2022 11:39:35 +0900 Subject: [PATCH] Clean: Icons - Other context menu --- css/leptonChrome.css | 31 +++------ src/icons/context_menu/_others.scss | 87 +++++++++++------------- src/icons/context_menu/_tab_toolbar.scss | 2 +- 3 files changed, 50 insertions(+), 70 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2a7793e..3a86f92 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6909,8 +6909,7 @@ .pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - - .pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem { + .pageActionContextMenuItem.extensionPinned.extensionUnpinned .removeExtensionItem { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } @@ -6982,7 +6981,6 @@ #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { --menuitem-image: url("../icons/link-square.svg"); } - #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { --menuitem-image: url("../icons/link.svg"); } @@ -7123,38 +7121,25 @@ } /*= context_sendTabToDevicePopupMenu =========================================*/ - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="phone"] { + .sync-menuitem.sendtab-target[clientType="phone"] { --menuitem-image: url("chrome://browser/skin/device-phone.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="tablet"] { + .sync-menuitem.sendtab-target[clientType="tablet"] { --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="desktop"] { + .sync-menuitem.sendtab-target[clientType="desktop"] { --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="tv"] { + .sync-menuitem.sendtab-target[clientType="tv"] { --menuitem-image: url("chrome://browser/skin/device-tv.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="vr"] { + .sync-menuitem.sendtab-target[clientType="vr"] { --menuitem-image: url("chrome://browser/skin/device-vr.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType=""] { + .sync-menuitem.sendtab-target[clientType=""] { --menuitem-image: url("../icons/send-to-device.svg"); } - - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target:not([clientType]) { + .sync-menuitem.sendtab-target:not([clientType]) { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } } diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index b04b213..f376873 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -26,11 +26,13 @@ } /*= pageActionContextMenu ====================================================*/ -.pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem { - --menuitem-image: url("chrome://global/skin/icons/settings.svg"); -} -.pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); +.pageActionContextMenuItem.extensionPinned.extensionUnpinned { + &.manageExtensionItem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + .removeExtensionItem { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } } /*= customizationPanelItemContextMenu ========================================*/ @@ -88,11 +90,13 @@ } } -#downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { - --menuitem-image: url("../icons/link-square.svg"); -} -#downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { - --menuitem-image: url("../icons/link.svg"); +#downloadsContextMenu > menuitem { + &[command="downloadsCmd_openReferrer"] { + --menuitem-image: url("../icons/link-square.svg"); + } + &[command="downloadsCmd_copyLocation"] { + --menuitem-image: url("../icons/link.svg"); + } } .downloadDeleteFileMenuItem { @@ -101,9 +105,11 @@ .downloadRemoveFromHistoryMenuItem { --menuitem-image: url("../icons/eraser.svg"); } -#downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], -#downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { - --menuitem-image: url("../icons/broom.svg"); +#downloadsContextMenu > menuitem { + &[command="downloadsCmd_clearList"], + &[command="downloadsCmd_clearDownloads"] { + --menuitem-image: url("../icons/broom.svg"); + } } /*= SyncedTabsSidebarContext =================================================*/ @@ -219,37 +225,26 @@ menuitem.searchbar-clear-history { } /*= context_sendTabToDevicePopupMenu =========================================*/ -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target[clientType=""] { - --menuitem-image: url("../icons/send-to-device.svg"); -} - -menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) - > .sync-menuitem.sendtab-target:not([clientType]) { - --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +.sync-menuitem.sendtab-target { + &[clientType="phone"] { + --menuitem-image: url("chrome://browser/skin/device-phone.svg"); + } + &[clientType="tablet"] { + --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + } + &[clientType="desktop"] { + --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + } + &[clientType="tv"] { + --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + } + &[clientType="vr"] { + --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + } + &[clientType=""] { + --menuitem-image: url("../icons/send-to-device.svg"); + } + &:not([clientType]) { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } } diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 7e3515b..00c8aaf 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -40,7 +40,7 @@ } #context_sendTabToDevice:is([disabled="true"]) + #context_shareTabURL, /* Legacy */ - #context_sendTabToDevice:is([disabled="true"]) + menuitem.share-tab-url-item { +#context_sendTabToDevice:is([disabled="true"]) + menuitem.share-tab-url-item { /* At windows */ --menuitem-image: url("../icons/share.svg"); }