From 24a6f20fa964780ff0f616c7e902775cc2121d20 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 29 Oct 2023 19:08:49 +0900 Subject: [PATCH] Feat: Icons - Apply new icons by @zapSNH --- css/leptonChrome.css | 396 +++++++++++++++------- css/leptonChromeESR.css | 187 ++++++---- css/leptonContent.css | 60 ++-- css/leptonContentESR.css | 30 +- icons/command-reponsivemode.svg | 1 - icons/command-responsivemode.svg | 8 +- icons/tab-photon.svg | 3 + icons/tab-unload-photon.svg | 1 + icons/{tag-open-content.svg => tag.svg} | 0 src/icons/_global_menu.scss | 16 +- src/icons/_index.scss | 25 ++ src/icons/_library.scss | 4 +- src/icons/_panel.scss | 43 ++- src/icons/context_menu/_content_area.scss | 28 +- src/icons/context_menu/_others.scss | 31 +- src/icons/context_menu/_place.scss | 8 +- src/icons/context_menu/_tab_toolbar.scss | 14 +- src/icons/fork_browsers/_floorp.scss | 4 +- src/library/_folder_icons.scss | 18 +- 19 files changed, 596 insertions(+), 281 deletions(-) delete mode 100644 icons/command-reponsivemode.svg create mode 100644 icons/tab-photon.svg create mode 100644 icons/tab-unload-photon.svg rename icons/{tag-open-content.svg => tag.svg} (100%) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8077980d..6bd09f84 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10487,6 +10487,14 @@ /** Icons - List **************************************************************/ :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + --uc-tab-icon: url("../icons/tab.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload.svg"); + --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); } @@ -10495,12 +10503,28 @@ --uc-folder-icon: url("../icons/folder.svg"); } } + @supports -moz-bool-pref("userChrome.tab.connect_to_window") { + :root { + --uc-tab-icon: url("../icons/tab-photon.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); + --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); + } + } @supports selector(:has(a)) { :root:has(#sidebar-box[positionend="true"]) { --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg"); } } + .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, + #urlbar-engine-one-off-item-tabs { + list-style-image: var(--uc-tab-icon) !important; + } /** Library - Icons Replace ***************************************************/ @supports -moz-bool-pref("userChrome.icon.library") { /*= Standard Folder - More Visible ===========================================*/ @@ -10562,8 +10586,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -10573,8 +10598,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -10611,7 +10643,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -10790,9 +10822,12 @@ background-size: 16px !important; background-image: var(--avatar-image-url) !important; } + #new-tab-button { + list-style-image: var(--uc-new-tab-icon) !important; + } @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { #appMenu-new-tab-button2 { - list-style-image: url("chrome://browser/skin/new-tab.svg"); + list-style-image: var(--uc-new-tab-icon); } } @supports -moz-bool-pref("userChrome.icon.panel_photon") { @@ -10873,6 +10908,33 @@ #open-file-button { list-style-image: url("../icons/toolbarButton-upload.svg") !important; } + #cut-button { + list-style-image: url("../icons/edit-cut.svg") !important; + } + #copy-button { + list-style-image: url("../icons/edit-copy.svg") !important; + } + #paste-button { + list-style-image: url("../icons/edit-paste.svg") !important; + } + #characterencoding-button { + list-style-image: url("../icons/characterEncoding.svg") !important; + } + #screenshot-button { + list-style-image: url("../icons/screenshot-1.svg") !important; + } + #email-link-button { + list-style-image: url("../icons/mail.svg") !important; + } + #panic-button { + list-style-image: url("../icons/forget.svg") !important; + } + #profiler-button-button > .toolbarbutton-icon { + list-style-image: url("../icons/performance.svg") !important; + } + #developer-button { + list-style-image: url("../icons/wrench-filled.svg") !important; + } #appMenu-settings-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } @@ -10996,14 +11058,14 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #panelMenu_viewBookmarksToolbar { - list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + list-style-image: url("../icons/bookmarks-toolbar-alt.svg"); } #panelMenu_showAllBookmarks { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } /*= Panel - History ==========================================================*/ #appMenuRecentlyClosedTabs { - list-style-image: url("chrome://browser/skin/tab.svg"); + list-style-image: var(--uc-tab-icon); } #appMenuRecentlyClosedWindows { list-style-image: url("chrome://browser/skin/window.svg"); @@ -11016,7 +11078,7 @@ list-style-image: url("../icons/restore-session.svg"); } #appMenuClearRecentHistory { - list-style-image: url("chrome://browser/skin/forget.svg"); + list-style-image: url("../icons/forget.svg"); } #PanelUI-historyMore { list-style-image: url("chrome://browser/skin/history.svg"); @@ -11162,7 +11224,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } #BMB_bookmarksToolbar { - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #BMB_bookmarksShowAllTop { @@ -11737,7 +11799,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab, #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition, #sidebartabs_asamuzak_jp-menuitem-_newTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -11789,10 +11851,10 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #context_bookmarkTab, #context_bookmarkSelectedTabs, @@ -11835,7 +11897,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs, #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #context_closeTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab, @@ -11893,7 +11955,7 @@ --menuitem-image: url("../icons/drawer-arrow-download.svg"); } #toolbar-context-openANewTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #toolbar-context-reloadSelectedTab, #toolbar-context-reloadSelectedTabs { @@ -11904,7 +11966,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #toolbar-context-selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #toolbar-context-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); @@ -11915,7 +11977,7 @@ } #toggle_PersonalToolbar { /* Also placeContext */ - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } menuitem.viewCustomizeToolbar { --menuitem-image: url("chrome://browser/skin/customize.svg"); @@ -12007,10 +12069,10 @@ --menuitem-image: url("../icons/link-square.svg"); } #context-openlinkincontainertab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkinusercontext-menu { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -12031,7 +12093,7 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); @@ -12106,7 +12168,7 @@ #context-sendimage, #context-sendvideo, #context-sendaudio { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-viewimageinfo { --menuitem-image: url("chrome://global/skin/icons/info.svg"); @@ -12150,13 +12212,13 @@ } } #context-cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #context-copy { --menuitem-image: url("../icons/edit-copy.svg"); } #context-paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #context-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -12171,7 +12233,7 @@ --menuitem-image: url("chrome://global/skin/icons/print.svg"); } #context-take-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-keywordfield { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -12204,7 +12266,7 @@ --menuitem-image: url("../icons/document-search.svg"); } #context-inspect-a11y { - --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); + --menuitem-image: url("../icons/tool-accessibility.svg"); } #context-inspect { --menuitem-image: url("../icons/command-pick.svg"); @@ -12234,7 +12296,7 @@ --menuitem-image: url("../icons/eye-show.svg"); } #context-openframeintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openframe { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -12252,7 +12314,7 @@ --menuitem-image: url("chrome://global/skin/icons/print.svg"); } #context-take-frame-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-viewframesource { --menuitem-image: url("../icons/document-search.svg"); @@ -12265,19 +12327,19 @@ --menuitem-image: url("../icons/timer10.svg"); } #tm-linkWithhistory { - --menuitem-image: url("../icons/new-tab-skip-forward.svg"); + --menuitem-image: var(--uc-new-tab-skip-forward-icon); } #tm-openAllLinks { - --menuitem-image: url("../icons/new-tab-multiple.svg"); + --menuitem-image: var(--uc-new-tab-multiple-icon); } #tm-openinverselink { - --menuitem-image: url("../icons/new-tab-forward.svg"); + --menuitem-image: var(--uc-new-tab-forward-icon); } #tm-content-closetab { --menuitem-image: url("../icons/dismiss-filled.svg"); } #tm-duplicateTabContext { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tm-duplicateinWinContext { --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); @@ -12353,7 +12415,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -12382,13 +12444,13 @@ --menuitem-image: url("../icons/text-sort-ascending.svg"); } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -12401,7 +12463,7 @@ --menuitem-image: url("../icons/vertical-line.svg"); } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -12488,7 +12550,7 @@ --menuitem-image: url("../icons/link-square.svg"); } #syncedTabsOpenSelectedInTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #syncedTabsOpenSelectedInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -12516,13 +12578,13 @@ --menuitem-image: url("../icons/undo.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -12543,13 +12605,18 @@ } } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #strip-on-share { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } + } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { #paste-and-go { @@ -12573,13 +12640,13 @@ } } .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -12594,23 +12661,23 @@ } } menuitem.searchbar-clear-history { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } /*= context_sendTabToDevicePopupMenu =========================================*/ .sync-menuitem.sendtab-target[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); + --menuitem-image: url("../icons/device-phone.svg"); } .sync-menuitem.sendtab-target[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + --menuitem-image: url("../icons/device-tablet.svg"); } .sync-menuitem.sendtab-target[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + --menuitem-image: url("../icons/device-desktop.svg"); } .sync-menuitem.sendtab-target[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + --menuitem-image: url("../icons/device-tv.svg"); } .sync-menuitem.sendtab-target[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + --menuitem-image: url("../icons/device-vr.svg"); } .sync-menuitem.sendtab-target[clientType=""] { --menuitem-image: url("../icons/send-to-device.svg"); @@ -12670,7 +12737,7 @@ /** Global Menu ***************************************************************/ /*= menu_FilePopup ===========================================================*/ #menu_newNavigatorTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #menu_newUserContext { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -12688,7 +12755,7 @@ --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/share.svg"); @@ -12720,13 +12787,13 @@ } } #menu_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #menu_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #menu_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #menu_delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -12754,7 +12821,7 @@ --menuitem-image: url("../icons/document-css.svg"); } #repair-text-encoding { - --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); + --menuitem-image: url("../icons/characterEncoding.svg"); } #enterFullScreenItem { --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); @@ -12770,7 +12837,7 @@ --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } #menu_showAllTabs { - --menuitem-image: url("../icons/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #documentDirection-swap { --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg"); @@ -12809,7 +12876,7 @@ --menuitem-image: url("chrome://browser/skin/history.svg"); } #sanitizeItem { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } #sync-tabs-menuitem { --menuitem-image: url("chrome://browser/skin/sync.svg"); @@ -12824,7 +12891,7 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } #historyUndoMenu { - --menuitem-image: url("chrome://browser/skin/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #historyUndoWindowMenu { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -12963,13 +13030,13 @@ } } #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -13094,10 +13161,10 @@ stroke: transparent !important; } #unloadWebpanelMenu { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #changeUAWebpanelMenu { - --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg"); + --menuitem-image: url("../icons/command-responsivemode.svg"); fill-opacity: 0; } #deleteWebpanelMenu { @@ -24641,6 +24708,14 @@ /** Icons - List **************************************************************/ :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + --uc-tab-icon: url("../icons/tab.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload.svg"); + --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); } @@ -24657,6 +24732,18 @@ --uc-folder-icon: url("../icons/folder.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.tab.connect_to_window") { + :root { + --uc-tab-icon: url("../icons/tab-photon.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); + --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); + } +} @media not (-moz-bool-pref: "userChrome.icon.disabled") { @supports selector(:has(a)) { :root:has(#sidebar-box[positionend="true"]) { @@ -24665,6 +24752,12 @@ } } } +@media not (-moz-bool-pref: "userChrome.icon.disabled") { + .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, + #urlbar-engine-one-off-item-tabs { + list-style-image: var(--uc-tab-icon) !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") { /*= Standard Folder - More Visible ===========================================*/ /* on Toolbar and Menus */ @@ -24725,8 +24818,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -24736,8 +24830,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -24774,7 +24875,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -25020,10 +25121,15 @@ background-image: var(--avatar-image-url) !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #new-tab-button { + list-style-image: var(--uc-new-tab-icon) !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"), (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") { #appMenu-new-tab-button2 { - list-style-image: url("chrome://browser/skin/new-tab.svg"); + list-style-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") { @@ -25119,6 +25225,51 @@ list-style-image: url("../icons/toolbarButton-upload.svg") !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #cut-button { + list-style-image: url("../icons/edit-cut.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #copy-button { + list-style-image: url("../icons/edit-copy.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #paste-button { + list-style-image: url("../icons/edit-paste.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #characterencoding-button { + list-style-image: url("../icons/characterEncoding.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #screenshot-button { + list-style-image: url("../icons/screenshot-1.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #email-link-button { + list-style-image: url("../icons/mail.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #panic-button { + list-style-image: url("../icons/forget.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #profiler-button-button > .toolbarbutton-icon { + list-style-image: url("../icons/performance.svg") !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #developer-button { + list-style-image: url("../icons/wrench-filled.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-settings-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); @@ -25278,7 +25429,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #panelMenu_viewBookmarksToolbar { - list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + list-style-image: url("../icons/bookmarks-toolbar-alt.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25288,7 +25439,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenuRecentlyClosedTabs { - list-style-image: url("chrome://browser/skin/tab.svg"); + list-style-image: var(--uc-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25309,7 +25460,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenuClearRecentHistory { - list-style-image: url("chrome://browser/skin/forget.svg"); + list-style-image: url("../icons/forget.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25514,7 +25665,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #BMB_bookmarksToolbar { - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { @@ -26112,7 +26263,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab, #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition, #sidebartabs_asamuzak_jp-menuitem-_newTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -26164,10 +26315,10 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #context_bookmarkTab, #context_bookmarkSelectedTabs, @@ -26238,7 +26389,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs, #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26318,7 +26469,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #toolbar-context-openANewTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26335,7 +26486,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #toolbar-context-selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26352,7 +26503,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #toggle_PersonalToolbar { /* Also placeContext */ - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26478,12 +26629,12 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-openlinkincontainertab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-openlinkintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26518,7 +26669,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26639,7 +26790,7 @@ #context-sendimage, #context-sendvideo, #context-sendaudio { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26709,7 +26860,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26719,7 +26870,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26744,7 +26895,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-take-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26797,7 +26948,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-inspect-a11y { - --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); + --menuitem-image: url("../icons/tool-accessibility.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26834,7 +26985,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-openframeintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26864,7 +27015,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-take-frame-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26884,17 +27035,17 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #tm-linkWithhistory { - --menuitem-image: url("../icons/new-tab-skip-forward.svg"); + --menuitem-image: var(--uc-new-tab-skip-forward-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #tm-openAllLinks { - --menuitem-image: url("../icons/new-tab-multiple.svg"); + --menuitem-image: var(--uc-new-tab-multiple-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #tm-openinverselink { - --menuitem-image: url("../icons/new-tab-forward.svg"); + --menuitem-image: var(--uc-new-tab-forward-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26904,7 +27055,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #tm-duplicateTabContext { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27020,7 +27171,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27065,7 +27216,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27075,7 +27226,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27096,7 +27247,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27219,7 +27370,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #syncedTabsOpenSelectedInTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27264,7 +27415,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27274,7 +27425,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27304,7 +27455,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27312,9 +27463,14 @@ --menuitem-image: url("../icons/edit-copy.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #strip-on-share { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { @@ -27344,7 +27500,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27354,7 +27510,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27374,24 +27530,24 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { menuitem.searchbar-clear-history { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .sync-menuitem.sendtab-target[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); + --menuitem-image: url("../icons/device-phone.svg"); } .sync-menuitem.sendtab-target[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + --menuitem-image: url("../icons/device-tablet.svg"); } .sync-menuitem.sendtab-target[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + --menuitem-image: url("../icons/device-desktop.svg"); } .sync-menuitem.sendtab-target[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + --menuitem-image: url("../icons/device-tv.svg"); } .sync-menuitem.sendtab-target[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + --menuitem-image: url("../icons/device-vr.svg"); } .sync-menuitem.sendtab-target[clientType=""] { --menuitem-image: url("../icons/send-to-device.svg"); @@ -27461,7 +27617,7 @@ /** Global Menu ***************************************************************/ /*= menu_FilePopup ===========================================================*/ #menu_newNavigatorTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #menu_newUserContext { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -27479,7 +27635,7 @@ --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/share.svg"); @@ -27524,7 +27680,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27534,7 +27690,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27579,7 +27735,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #repair-text-encoding { - --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); + --menuitem-image: url("../icons/characterEncoding.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27605,7 +27761,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_showAllTabs { - --menuitem-image: url("../icons/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27662,7 +27818,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #sanitizeItem { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27687,7 +27843,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #historyUndoMenu { - --menuitem-image: url("chrome://browser/skin/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -27892,7 +28048,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { @@ -27902,7 +28058,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { @@ -28038,10 +28194,10 @@ stroke: transparent !important; } #unloadWebpanelMenu { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #changeUAWebpanelMenu { - --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg"); + --menuitem-image: url("../icons/command-responsivemode.svg"); fill-opacity: 0; } #deleteWebpanelMenu { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 2b1fc991..2b831c83 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -10904,6 +10904,14 @@ /** Icons - List **************************************************************/ :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + --uc-tab-icon: url("../icons/tab.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload.svg"); + --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); } @@ -10912,12 +10920,28 @@ --uc-folder-icon: url("../icons/folder.svg"); } } + @supports -moz-bool-pref("userChrome.tab.connect_to_window") { + :root { + --uc-tab-icon: url("../icons/tab-photon.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); + --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); + } + } @supports selector(:has(a)) { :root:has(#sidebar-box[positionend="true"]) { --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg"); } } + .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, + #urlbar-engine-one-off-item-tabs { + list-style-image: var(--uc-tab-icon) !important; + } /** Library - Icons Replace ***************************************************/ @supports -moz-bool-pref("userChrome.icon.library") { /*= Standard Folder - More Visible ===========================================*/ @@ -10979,8 +11003,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -10990,8 +11015,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -11028,7 +11060,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -11207,9 +11239,12 @@ background-size: 16px !important; background-image: var(--avatar-image-url) !important; } + #new-tab-button { + list-style-image: var(--uc-new-tab-icon) !important; + } @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { #appMenu-new-tab-button2 { - list-style-image: url("chrome://browser/skin/new-tab.svg"); + list-style-image: var(--uc-new-tab-icon); } } @supports -moz-bool-pref("userChrome.icon.panel_photon") { @@ -11290,6 +11325,33 @@ #open-file-button { list-style-image: url("../icons/toolbarButton-upload.svg") !important; } + #cut-button { + list-style-image: url("../icons/edit-cut.svg") !important; + } + #copy-button { + list-style-image: url("../icons/edit-copy.svg") !important; + } + #paste-button { + list-style-image: url("../icons/edit-paste.svg") !important; + } + #characterencoding-button { + list-style-image: url("../icons/characterEncoding.svg") !important; + } + #screenshot-button { + list-style-image: url("../icons/screenshot-1.svg") !important; + } + #email-link-button { + list-style-image: url("../icons/mail.svg") !important; + } + #panic-button { + list-style-image: url("../icons/forget.svg") !important; + } + #profiler-button-button > .toolbarbutton-icon { + list-style-image: url("../icons/performance.svg") !important; + } + #developer-button { + list-style-image: url("../icons/wrench-filled.svg") !important; + } #appMenu-settings-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } @@ -11413,14 +11475,14 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #panelMenu_viewBookmarksToolbar { - list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + list-style-image: url("../icons/bookmarks-toolbar-alt.svg"); } #panelMenu_showAllBookmarks { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } /*= Panel - History ==========================================================*/ #appMenuRecentlyClosedTabs { - list-style-image: url("chrome://browser/skin/tab.svg"); + list-style-image: var(--uc-tab-icon); } #appMenuRecentlyClosedWindows { list-style-image: url("chrome://browser/skin/window.svg"); @@ -11433,7 +11495,7 @@ list-style-image: url("../icons/restore-session.svg"); } #appMenuClearRecentHistory { - list-style-image: url("chrome://browser/skin/forget.svg"); + list-style-image: url("../icons/forget.svg"); } #PanelUI-historyMore { list-style-image: url("chrome://browser/skin/history.svg"); @@ -11579,7 +11641,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } #BMB_bookmarksToolbar { - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #BMB_bookmarksShowAllTop { @@ -12343,7 +12405,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab, #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition, #sidebartabs_asamuzak_jp-menuitem-_newTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -12395,10 +12457,10 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #context_bookmarkTab, #context_bookmarkSelectedTabs, @@ -12441,7 +12503,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs, #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #context_closeTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab, @@ -12499,7 +12561,7 @@ --menuitem-image: url("../icons/drawer-arrow-download.svg"); } #toolbar-context-openANewTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #toolbar-context-reloadSelectedTab, #toolbar-context-reloadSelectedTabs { @@ -12510,7 +12572,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #toolbar-context-selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #toolbar-context-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); @@ -12521,7 +12583,7 @@ } #toggle_PersonalToolbar { /* Also placeContext */ - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } menuitem.viewCustomizeToolbar { --menuitem-image: url("chrome://browser/skin/customize.svg"); @@ -12616,10 +12678,10 @@ --menuitem-image: url("../icons/link-square.svg"); } #context-openlinkincontainertab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkinusercontext-menu { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -12640,7 +12702,7 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); @@ -12715,7 +12777,7 @@ #context-sendimage, #context-sendvideo, #context-sendaudio { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-viewimageinfo { --menuitem-image: url("chrome://global/skin/icons/info.svg"); @@ -12759,13 +12821,13 @@ } } #context-cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #context-copy { --menuitem-image: url("../icons/edit-copy.svg"); } #context-paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #context-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -12780,7 +12842,7 @@ --menuitem-image: url("chrome://global/skin/icons/print.svg"); } #context-take-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-keywordfield { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -12813,7 +12875,7 @@ --menuitem-image: url("../icons/document-search.svg"); } #context-inspect-a11y { - --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); + --menuitem-image: url("../icons/tool-accessibility.svg"); } #context-inspect { --menuitem-image: url("../icons/command-pick.svg"); @@ -12843,7 +12905,7 @@ --menuitem-image: url("../icons/eye-show.svg"); } #context-openframeintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openframe { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -12861,7 +12923,7 @@ --menuitem-image: url("chrome://global/skin/icons/print.svg"); } #context-take-frame-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-viewframesource { --menuitem-image: url("../icons/document-search.svg"); @@ -12874,19 +12936,19 @@ --menuitem-image: url("../icons/timer10.svg"); } #tm-linkWithhistory { - --menuitem-image: url("../icons/new-tab-skip-forward.svg"); + --menuitem-image: var(--uc-new-tab-skip-forward-icon); } #tm-openAllLinks { - --menuitem-image: url("../icons/new-tab-multiple.svg"); + --menuitem-image: var(--uc-new-tab-multiple-icon); } #tm-openinverselink { - --menuitem-image: url("../icons/new-tab-forward.svg"); + --menuitem-image: var(--uc-new-tab-forward-icon); } #tm-content-closetab { --menuitem-image: url("../icons/dismiss-filled.svg"); } #tm-duplicateTabContext { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tm-duplicateinWinContext { --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); @@ -12962,7 +13024,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -12991,13 +13053,13 @@ --menuitem-image: url("../icons/text-sort-ascending.svg"); } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -13010,7 +13072,7 @@ --menuitem-image: url("../icons/vertical-line.svg"); } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -13097,7 +13159,7 @@ --menuitem-image: url("../icons/link-square.svg"); } #syncedTabsOpenSelectedInTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #syncedTabsOpenSelectedInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -13125,13 +13187,13 @@ --menuitem-image: url("../icons/undo.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -13152,13 +13214,18 @@ } } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #strip-on-share { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } + } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { #paste-and-go { @@ -13182,13 +13249,13 @@ } } .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -13203,23 +13270,23 @@ } } menuitem.searchbar-clear-history { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } /*= context_sendTabToDevicePopupMenu =========================================*/ .sync-menuitem.sendtab-target[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); + --menuitem-image: url("../icons/device-phone.svg"); } .sync-menuitem.sendtab-target[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + --menuitem-image: url("../icons/device-tablet.svg"); } .sync-menuitem.sendtab-target[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + --menuitem-image: url("../icons/device-desktop.svg"); } .sync-menuitem.sendtab-target[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + --menuitem-image: url("../icons/device-tv.svg"); } .sync-menuitem.sendtab-target[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + --menuitem-image: url("../icons/device-vr.svg"); } .sync-menuitem.sendtab-target[clientType=""] { --menuitem-image: url("../icons/send-to-device.svg"); @@ -13279,7 +13346,7 @@ /** Global Menu ***************************************************************/ /*= menu_FilePopup ===========================================================*/ #menu_newNavigatorTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #menu_newUserContext { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -13297,7 +13364,7 @@ --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/share.svg"); @@ -13329,13 +13396,13 @@ } } #menu_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #menu_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #menu_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #menu_delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -13363,7 +13430,7 @@ --menuitem-image: url("../icons/document-css.svg"); } #repair-text-encoding { - --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); + --menuitem-image: url("../icons/characterEncoding.svg"); } #enterFullScreenItem { --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); @@ -13379,7 +13446,7 @@ --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } #menu_showAllTabs { - --menuitem-image: url("../icons/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #documentDirection-swap { --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg"); @@ -13418,7 +13485,7 @@ --menuitem-image: url("chrome://browser/skin/history.svg"); } #sanitizeItem { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } #sync-tabs-menuitem { --menuitem-image: url("chrome://browser/skin/sync.svg"); @@ -13433,7 +13500,7 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } #historyUndoMenu { - --menuitem-image: url("chrome://browser/skin/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #historyUndoWindowMenu { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -13572,13 +13639,13 @@ } } #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -13703,10 +13770,10 @@ stroke: transparent !important; } #unloadWebpanelMenu { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #changeUAWebpanelMenu { - --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg"); + --menuitem-image: url("../icons/command-responsivemode.svg"); fill-opacity: 0; } #deleteWebpanelMenu { diff --git a/css/leptonContent.css b/css/leptonContent.css index a3cf45a2..62041ecf 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2265,8 +2265,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -2276,8 +2277,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -2315,7 +2323,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -3406,7 +3414,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -3435,13 +3443,13 @@ --menuitem-image: url("../icons/text-sort-ascending.svg"); } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3454,7 +3462,7 @@ --menuitem-image: url("../icons/vertical-line.svg"); } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3490,13 +3498,13 @@ } } #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -5882,8 +5890,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -5893,8 +5902,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -5932,7 +5948,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -7103,7 +7119,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -7132,13 +7148,13 @@ --menuitem-image: url("../icons/text-sort-ascending.svg"); } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -7151,7 +7167,7 @@ --menuitem-image: url("../icons/vertical-line.svg"); } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -7191,7 +7207,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -7201,7 +7217,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index f042280f..c1f079d8 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2268,8 +2268,9 @@ } /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), + .bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { @@ -2279,8 +2280,15 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + treechildren::-moz-tree-image(container, queryFolder_toolbar_____), + #editBMPanel_folderMenuList[selectedGuid="toolbar_____"], + #editBMPanel_toolbarFolderItem, + #bookmarksToolbarFolderMenu, + #BMB_bookmarksToolbar, + #panelMenu_bookmarksToolbar, + #bookmarks-toolbar-button, + #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -2318,7 +2326,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) @@ -3545,7 +3553,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -3574,13 +3582,13 @@ --menuitem-image: url("../icons/text-sort-ascending.svg"); } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3593,7 +3601,7 @@ --menuitem-image: url("../icons/vertical-line.svg"); } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3629,13 +3637,13 @@ } } #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); diff --git a/icons/command-reponsivemode.svg b/icons/command-reponsivemode.svg deleted file mode 100644 index 74f72d31..00000000 --- a/icons/command-reponsivemode.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/command-responsivemode.svg b/icons/command-responsivemode.svg index 66a48180..74f72d31 100644 --- a/icons/command-responsivemode.svg +++ b/icons/command-responsivemode.svg @@ -1,7 +1 @@ - - - - - + \ No newline at end of file diff --git a/icons/tab-photon.svg b/icons/tab-photon.svg new file mode 100644 index 00000000..2b0c392d --- /dev/null +++ b/icons/tab-photon.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/icons/tab-unload-photon.svg b/icons/tab-unload-photon.svg new file mode 100644 index 00000000..cc231b5b --- /dev/null +++ b/icons/tab-unload-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/tag-open-content.svg b/icons/tag.svg similarity index 100% rename from icons/tag-open-content.svg rename to icons/tag.svg diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index deb40253..95d9dcea 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -1,7 +1,7 @@ /** Global Menu ***************************************************************/ /*= menu_FilePopup ===========================================================*/ #menu_newNavigatorTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #menu_newUserContext { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -30,7 +30,7 @@ --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/share.svg"); @@ -70,13 +70,13 @@ menu.share-tab-url-item { } #menu_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #menu_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #menu_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #menu_delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -115,7 +115,7 @@ menu.share-tab-url-item { --menuitem-image: url("../icons/document-css.svg"); } #repair-text-encoding { - --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); + --menuitem-image: url("../icons/characterEncoding.svg"); } #enterFullScreenItem { @@ -132,7 +132,7 @@ menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } #menu_showAllTabs { - --menuitem-image: url("../icons/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #documentDirection-swap { @@ -177,7 +177,7 @@ menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/history.svg"); } #sanitizeItem { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } #sync-tabs-menuitem { @@ -193,7 +193,7 @@ menu.share-tab-url-item { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } #historyUndoMenu { - --menuitem-image: url("chrome://browser/skin/tab.svg"); + --menuitem-image: var(--uc-tab-icon); } #historyUndoWindowMenu { --menuitem-image: url("chrome://browser/skin/window.svg"); diff --git a/src/icons/_index.scss b/src/icons/_index.scss index e579a1ab..168cb9c6 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -3,6 +3,25 @@ :root { @include initIcons; + --uc-tab-icon: url("../icons/tab.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload.svg"); + --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); + @include Option("userChrome.tab.connect_to_window") { + --uc-tab-icon: url("../icons/tab-photon.svg"); + --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); + --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); + --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); + --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg"); + --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); + } + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); @include Has { @@ -13,6 +32,12 @@ } } + +.urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, +#urlbar-engine-one-off-item-tabs { + list-style-image: var(--uc-tab-icon) !important; +} + /** Library - Icons Replace ***************************************************/ @include Option("userChrome.icon.library") { @import "../library/chrome"; diff --git a/src/icons/_library.scss b/src/icons/_library.scss index 928803a8..a4791edb 100644 --- a/src/icons/_library.scss +++ b/src/icons/_library.scss @@ -19,13 +19,13 @@ } #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 0c880b79..ddb1739c 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -24,9 +24,12 @@ background-image: var(--avatar-image-url) !important; } +#new-tab-button { + list-style-image: var(--uc-new-tab-icon) !important; +} @include Option("userChrome.icon.panel_full", "userChrome.icon.panel_photon") { #appMenu-new-tab-button2 { - list-style-image: url("chrome://browser/skin/new-tab.svg"); + list-style-image: var(--uc-new-tab-icon); } } @include Option("userChrome.icon.panel_photon") { @@ -112,6 +115,36 @@ list-style-image: url("../icons/toolbarButton-upload.svg") !important; } +#cut-button { + list-style-image: url("../icons/edit-cut.svg") !important; +} +#copy-button { + list-style-image: url("../icons/edit-copy.svg") !important; +} +#paste-button { + list-style-image: url("../icons/edit-paste.svg") !important; +} + +#characterencoding-button { + list-style-image: url("../icons/characterEncoding.svg") !important; +} +#screenshot-button { + list-style-image: url("../icons/screenshot-1.svg") !important; +} +#email-link-button { + list-style-image: url("../icons/mail.svg") !important; +} + +#panic-button { + list-style-image: url("../icons/forget.svg") !important; +} +#profiler-button-button > .toolbarbutton-icon { + list-style-image: url("../icons/performance.svg") !important; +} +#developer-button { + list-style-image: url("../icons/wrench-filled.svg") !important; +} + #appMenu-settings-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } @@ -238,7 +271,7 @@ panelMenuBookmarkThisPage[starred] { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #panelMenu_viewBookmarksToolbar { - list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + list-style-image: url("../icons/bookmarks-toolbar-alt.svg"); } #panelMenu_showAllBookmarks { @@ -247,7 +280,7 @@ panelMenuBookmarkThisPage[starred] { /*= Panel - History ==========================================================*/ #appMenuRecentlyClosedTabs { - list-style-image: url("chrome://browser/skin/tab.svg"); + list-style-image: var(--uc-tab-icon); } #appMenuRecentlyClosedWindows { list-style-image: url("chrome://browser/skin/window.svg"); @@ -260,7 +293,7 @@ panelMenuBookmarkThisPage[starred] { list-style-image: url("../icons/restore-session.svg"); } #appMenuClearRecentHistory { - list-style-image: url("chrome://browser/skin/forget.svg"); + list-style-image: url("../icons/forget.svg"); } #PanelUI-historyMore { @@ -417,7 +450,7 @@ panelMenuBookmarkThisPage[starred] { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } #BMB_bookmarksToolbar { - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } @include OS($mac) { diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 8201c054..f0e07c63 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -26,10 +26,10 @@ --menuitem-image: url("../icons/link-square.svg"); } #context-openlinkincontainertab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openlinkinusercontext-menu { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -51,7 +51,7 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); @@ -129,7 +129,7 @@ #context-sendimage, #context-sendvideo, #context-sendaudio { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); } #context-viewimageinfo { --menuitem-image: url("chrome://global/skin/icons/info.svg"); @@ -176,13 +176,13 @@ } #context-cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #context-copy { --menuitem-image: url("../icons/edit-copy.svg"); } #context-paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #context-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -198,7 +198,7 @@ } #context-take-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-keywordfield { @@ -236,7 +236,7 @@ --menuitem-image: url("../icons/document-search.svg"); } #context-inspect-a11y { - --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); + --menuitem-image: url("../icons/tool-accessibility.svg"); } #context-inspect { --menuitem-image: url("../icons/command-pick.svg"); @@ -270,7 +270,7 @@ --menuitem-image: url("../icons/eye-show.svg"); } #context-openframeintab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #context-openframe { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -292,7 +292,7 @@ } #context-take-frame-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-viewframesource { @@ -312,20 +312,20 @@ #tm-linkWithhistory { // ic_fluent_skip_forward_tab_24_regular - --menuitem-image: url("../icons/new-tab-skip-forward.svg"); + --menuitem-image: var(--uc-new-tab-skip-forward-icon); } #tm-openAllLinks { - --menuitem-image: url("../icons/new-tab-multiple.svg"); + --menuitem-image: var(--uc-new-tab-multiple-icon); } #tm-openinverselink { - --menuitem-image: url("../icons/new-tab-forward.svg"); + --menuitem-image: var(--uc-new-tab-forward-icon); } #tm-content-closetab { --menuitem-image: url("../icons/dismiss-filled.svg"); } #tm-duplicateTabContext { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tm-duplicateinWinContext { --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 2d7871f5..8fe0d53a 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -84,7 +84,7 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] { --menuitem-image: url("../icons/link-square.svg"); } #syncedTabsOpenSelectedInTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #syncedTabsOpenSelectedInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -115,13 +115,13 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] { --menuitem-image: url("../icons/undo.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -146,13 +146,18 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] { } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } +#strip-on-share { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } +} #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #paste-and-go { @include Option("userChrome.icon.menu.full") { @@ -178,13 +183,13 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] { } .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); @@ -200,25 +205,25 @@ menuitem.searchbar-paste-and-search { } } menuitem.searchbar-clear-history { - --menuitem-image: url("chrome://browser/skin/forget.svg"); + --menuitem-image: url("../icons/forget.svg"); } /*= context_sendTabToDevicePopupMenu =========================================*/ .sync-menuitem.sendtab-target { &[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); + --menuitem-image: url("../icons/device-phone.svg"); } &[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + --menuitem-image: url("../icons/device-tablet.svg"); } &[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + --menuitem-image: url("../icons/device-desktop.svg"); } &[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + --menuitem-image: url("../icons/device-tv.svg"); } &[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + --menuitem-image: url("../icons/device-vr.svg"); } &[clientType=""] { --menuitem-image: url("../icons/send-to-device.svg"); diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss index 136ecaf0..ff23f51a 100644 --- a/src/icons/context_menu/_place.scss +++ b/src/icons/context_menu/_place.scss @@ -9,7 +9,7 @@ #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); @@ -40,13 +40,13 @@ } #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + --menuitem-image: url("../icons/edit-cut.svg"); } #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_new\:bookmark { @@ -61,7 +61,7 @@ } #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + --menuitem-image: url("../icons/edit-paste.svg"); } #placesContext_createBookmark { diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index f2acdcfa..d90a56f9 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -3,7 +3,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab, #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition, #sidebartabs_asamuzak_jp-menuitem-_newTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -56,10 +56,10 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/tab-copy.svg"); + --menuitem-image: var(--uc-tab-copy-icon); } #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #context_bookmarkTab, @@ -108,7 +108,7 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs, #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #sidebartabs_asamuzak_jp-menuitem-_tabGroup { @@ -182,7 +182,7 @@ --menuitem-image: url("../icons/drawer-arrow-download.svg"); } #toolbar-context-openANewTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + --menuitem-image: var(--uc-new-tab-icon); } #toolbar-context-reloadSelectedTab, @@ -194,7 +194,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #toolbar-context-selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + --menuitem-image: var(--uc-tab-multiple-icon); } #toolbar-context-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); @@ -206,7 +206,7 @@ } #toggle_PersonalToolbar { /* Also placeContext */ - --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg"); } menuitem.viewCustomizeToolbar { diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 2452ffa9..1e6e15bb 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -53,10 +53,10 @@ stroke: transparent !important; } #unloadWebpanelMenu { - --menuitem-image: url("../icons/tab-unload.svg"); + --menuitem-image: var(--uc-tab-unload-icon); } #changeUAWebpanelMenu { - --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg"); + --menuitem-image: url("../icons/command-responsivemode.svg"); fill-opacity: 0; } #deleteWebpanelMenu { diff --git a/src/library/_folder_icons.scss b/src/library/_folder_icons.scss index 9d0e6e8f..fa6f42ff 100644 --- a/src/library/_folder_icons.scss +++ b/src/library/_folder_icons.scss @@ -65,8 +65,9 @@ /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), -:-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { - list-style-image: url("chrome://browser/skin/places/tag.svg") !important; +:-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v), +.bookmark-item[query][tagContainer] { + list-style-image: url("../icons/tag.svg") !important; } /* Bookmark */ @@ -77,8 +78,15 @@ /* Bookmark Toolbar */ #BMB_bookmarksPopup #BMB_bookmarksToolbar, /* Original: Default folder icon */ #bookmarksMenuPopup #bookmarksToolbarFolderMenu, /* Original: Default folder icon */ -:-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; +:-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_toolbar_____), +#editBMPanel_folderMenuList[selectedGuid="toolbar_____"], +#editBMPanel_toolbarFolderItem, +#bookmarksToolbarFolderMenu, +#BMB_bookmarksToolbar, +#panelMenu_bookmarksToolbar, +#bookmarks-toolbar-button, +#bookmarks-toolbar-placeholder { + list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important; } /* Bookmark Menu */ @@ -121,7 +129,7 @@ #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; + list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important; } /* Bookmark Menu */