diff --git a/css/leptonChrome.css b/css/leptonChrome.css index f90eb29e..61661fb4 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10484,6 +10484,46 @@ } /** Icons *********************************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { + /** 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-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --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-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 ===========================================*/ @@ -10495,7 +10535,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -10545,8 +10585,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) { @@ -10556,8 +10597,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) @@ -10594,7 +10642,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) @@ -10650,16 +10698,6 @@ } } /** Panel - Icons *************************************************************/ - :root { - --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); - --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.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"); - } - } @supports -moz-bool-pref("userChrome.icon.panel") { /*= Padding ==================================================================*/ :root { @@ -10783,9 +10821,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") { @@ -10866,12 +10907,39 @@ #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"); } @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-more-button2 { - list-style-image: url("chrome://browser/skin/ion.svg"); + list-style-image: url("../icons/ion.svg"); } } @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { @@ -10989,14 +11057,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"); @@ -11009,7 +11077,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"); @@ -11155,7 +11223,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 { @@ -11730,7 +11798,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"); @@ -11782,10 +11850,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, @@ -11828,7 +11896,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, @@ -11886,7 +11954,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 { @@ -11897,7 +11965,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"); @@ -11908,7 +11976,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"); @@ -12000,10 +12068,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"); @@ -12024,11 +12092,17 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); + } + #context-copyphone { + --menuitem-image: url("../icons/device-phone.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); } + #context-stripOnShareLink { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } #context-sendlinktodevice { --menuitem-image: url("../icons/send-to-device.svg"); } @@ -12099,7 +12173,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"); @@ -12143,13 +12217,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"); @@ -12164,7 +12238,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"); @@ -12197,7 +12271,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"); @@ -12227,7 +12301,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"); @@ -12245,7 +12319,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"); @@ -12258,19 +12332,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"); @@ -12315,12 +12389,7 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { @@ -12351,7 +12420,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"); @@ -12380,32 +12449,26 @@ --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"); } #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #placesContext_new\:separator { --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"); @@ -12492,7 +12555,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"); @@ -12520,13 +12583,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"); @@ -12547,13 +12610,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 { @@ -12577,13 +12645,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"); @@ -12598,23 +12666,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"); @@ -12674,7 +12742,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"); @@ -12692,7 +12760,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"); @@ -12724,13 +12792,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"); @@ -12758,7 +12826,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"); @@ -12774,7 +12842,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"); @@ -12813,7 +12881,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"); @@ -12828,7 +12896,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"); @@ -12953,12 +13021,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); @@ -12972,13 +13035,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"); @@ -13063,7 +13126,7 @@ list-style-image: url("../icons/refresh-cw.svg"); } #openprofiledir { - list-style-image: url("../icons/folder.svg"); + list-style-image: var(--uc-folder-icon); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13083,7 +13146,7 @@ --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -13103,10 +13166,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 { @@ -24647,6 +24710,20 @@ } /** Icons *********************************************************************/ @media not (-moz-bool-pref: "userChrome.icon.disabled") { + /** 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-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); + } /** Library - Icons Replace ***************************************************/ /** Panel - Icons *************************************************************/ /** Menu - Icons Layout *******************************************************/ @@ -24655,6 +24732,36 @@ /*= Tor Browser ==============================================================*/ /*= Floorp Browser ===========================================================*/ } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") { + :root { + --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-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"]) { + --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg"); + } + } +} +@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 */ @@ -24665,7 +24772,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -24715,8 +24822,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) { @@ -24726,8 +24834,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) @@ -24764,7 +24879,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) @@ -24819,18 +24934,6 @@ } } } -@media not (-moz-bool-pref: "userChrome.icon.disabled") { - :root { - --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); - --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.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"); - } - } -} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { /*= Padding ==================================================================*/ :root { @@ -25022,10 +25125,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") { @@ -25121,6 +25229,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"); @@ -25128,7 +25281,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full") { #appMenu-more-button2 { - list-style-image: url("chrome://browser/skin/ion.svg"); + list-style-image: url("../icons/ion.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"), @@ -25280,7 +25433,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") { @@ -25290,7 +25443,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") { @@ -25311,7 +25464,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") { @@ -25516,7 +25669,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") { @@ -26114,7 +26267,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"); @@ -26166,10 +26319,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, @@ -26240,7 +26393,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") { @@ -26320,7 +26473,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") { @@ -26337,7 +26490,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") { @@ -26354,7 +26507,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") { @@ -26480,12 +26633,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") { @@ -26520,7 +26673,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-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") { + #context-copyphone { + --menuitem-image: url("../icons/device-phone.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -26528,6 +26686,11 @@ --menuitem-image: url("../icons/link.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-stripOnShareLink { + --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") { #context-sendlinktodevice { --menuitem-image: url("../icons/send-to-device.svg"); @@ -26641,7 +26804,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") { @@ -26711,7 +26874,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") { @@ -26721,7 +26884,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") { @@ -26746,7 +26909,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") { @@ -26799,7 +26962,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") { @@ -26836,7 +26999,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") { @@ -26866,7 +27029,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") { @@ -26886,17 +27049,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") { @@ -26906,7 +27069,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") { @@ -26978,12 +27141,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.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.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27027,7 +27185,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") { @@ -27072,7 +27230,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") { @@ -27082,7 +27240,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") { @@ -27093,13 +27251,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_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.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.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27109,7 +27261,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") { @@ -27232,7 +27384,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") { @@ -27277,7 +27429,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") { @@ -27287,7 +27439,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") { @@ -27317,7 +27469,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") { @@ -27325,9 +27477,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") { @@ -27357,7 +27514,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") { @@ -27367,7 +27524,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") { @@ -27387,24 +27544,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"); @@ -27474,7 +27631,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"); @@ -27492,7 +27649,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"); @@ -27537,7 +27694,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") { @@ -27547,7 +27704,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") { @@ -27592,7 +27749,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") { @@ -27618,7 +27775,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") { @@ -27675,7 +27832,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") { @@ -27700,7 +27857,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") { @@ -27887,25 +28044,16 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } - /*= viewMenuPopup ============================================================*/ - /*= maintenanceButtonPopup ===================================================*/ -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") and (-moz-bool-pref: "userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { #orgUndo { --menuitem-image: url("../icons/undo.svg"); } + /*= viewMenuPopup ============================================================*/ + /*= maintenanceButtonPopup ===================================================*/ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") and (-moz-bool-pref: "userChrome.icon.menu.full") { #orgRedo { @@ -27914,7 +28062,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") { @@ -27924,7 +28072,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") { @@ -28020,7 +28168,7 @@ list-style-image: url("../icons/refresh-cw.svg"); } #openprofiledir { - list-style-image: url("../icons/folder.svg"); + list-style-image: var(--uc-folder-icon); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @@ -28040,7 +28188,7 @@ --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -28060,10 +28208,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 c341e5c4..8c5b83c4 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -1,6 +1,6 @@ @charset "UTF-8"; -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -@namespace html "http://www.w3.org/1999/xhtml"; +@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); /** Default Theme - Contrast **************************************************/ @supports -moz-bool-pref("userChrome.theme.built_in_contrast") { /*= Lightmode - Color darker =================================================*/ @@ -10901,6 +10901,46 @@ } /** Icons *********************************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { + /** 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-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg"); + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --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-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 ===========================================*/ @@ -10912,7 +10952,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -10962,8 +11002,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) { @@ -10973,8 +11014,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) @@ -11011,7 +11059,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) @@ -11067,16 +11115,6 @@ } } /** Panel - Icons *************************************************************/ - :root { - --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); - --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.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"); - } - } @supports -moz-bool-pref("userChrome.icon.panel") { /*= Padding ==================================================================*/ :root { @@ -11200,9 +11238,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") { @@ -11283,12 +11324,39 @@ #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"); } @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-more-button2 { - list-style-image: url("chrome://browser/skin/ion.svg"); + list-style-image: url("../icons/ion.svg"); } } @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { @@ -11406,14 +11474,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"); @@ -11426,7 +11494,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"); @@ -11572,7 +11640,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 { @@ -12336,7 +12404,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"); @@ -12388,10 +12456,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, @@ -12434,7 +12502,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, @@ -12492,7 +12560,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 { @@ -12503,7 +12571,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"); @@ -12514,7 +12582,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"); @@ -12609,10 +12677,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"); @@ -12633,11 +12701,17 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); + } + #context-copyphone { + --menuitem-image: url("../icons/device-phone.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); } + #context-stripOnShareLink { + --menuitem-image: url("../icons/link-no-tracking.svg"); + } #context-sendlinktodevice { --menuitem-image: url("../icons/send-to-device.svg"); } @@ -12708,7 +12782,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"); @@ -12752,13 +12826,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"); @@ -12773,7 +12847,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"); @@ -12806,7 +12880,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"); @@ -12836,7 +12910,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"); @@ -12854,7 +12928,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"); @@ -12867,19 +12941,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"); @@ -12924,12 +12998,7 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { @@ -12960,7 +13029,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"); @@ -12989,32 +13058,26 @@ --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"); } #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #placesContext_new\:separator { --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"); @@ -13101,7 +13164,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"); @@ -13129,13 +13192,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"); @@ -13156,13 +13219,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 { @@ -13186,13 +13254,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"); @@ -13207,23 +13275,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"); @@ -13283,7 +13351,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"); @@ -13301,7 +13369,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"); @@ -13333,13 +13401,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"); @@ -13367,7 +13435,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"); @@ -13383,7 +13451,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"); @@ -13422,7 +13490,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"); @@ -13437,7 +13505,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"); @@ -13562,12 +13630,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); @@ -13581,13 +13644,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"); @@ -13672,7 +13735,7 @@ list-style-image: url("../icons/refresh-cw.svg"); } #openprofiledir { - list-style-image: url("../icons/folder.svg"); + list-style-image: var(--uc-folder-icon); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13692,7 +13755,7 @@ --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -13712,10 +13775,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 584db7c6..62041ecf 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2215,7 +2215,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -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) @@ -3173,6 +3181,14 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { + :root { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } + } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), @@ -3367,12 +3383,7 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { @@ -3403,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"); @@ -3432,32 +3443,26 @@ --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"); } #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #placesContext_new\:separator { --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"); @@ -3479,12 +3484,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); @@ -3498,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"); @@ -5840,7 +5840,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -5890,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) { @@ -5901,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) @@ -5940,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) @@ -6881,6 +6889,16 @@ } } /** Menu - Icons Layout *******************************************************/ +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { + :root { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { @@ -7070,16 +7088,8 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } - /*= placeContext =============================================================*/ - } - @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.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); - } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { --menuitem-image: url("../icons/link-square.svg"); @@ -7088,140 +7098,87 @@ #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { --menuitem-image: url("../icons/link.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .downloadDeleteFileMenuItem { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .downloadRemoveFromHistoryMenuItem { --menuitem-image: url("../icons/eraser.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { --menuitem-image: url("../icons/broom.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + /*= placeContext =============================================================*/ #placesContext_open { --menuitem-image: url("../icons/link-square.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_openBookmarkContainer\:tabs, #placesContext_openBookmarkLinks\:tabs { --menuitem-image: url("../icons/movetowindow-16.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #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") { #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_open\:newwindow { --menuitem-image: url("chrome://browser/skin/window.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_open\:newprivatewindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_deleteBookmark, #placesContext_deleteFolder, #placesContext_delete, #placesContext_delete_history { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_deleteHost { --menuitem-image: url("../icons/eye-hide.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_sortBy\:name { --menuitem-image: url("../icons/text-sort-ascending.svg"); } - } - @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") { #placesContext_copy { --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") { #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") { #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } - } - @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.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); - } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_new\:separator { --menuitem-image: url("../icons/vertical-line.svg"); } - } - @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") { #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #show-other-bookmarks_PersonalToolbar { /* checkbox */ --menuitem-image: url("../icons/star-line-horizontal.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #placesContext_showAllBookmarks { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .openintabs-menuitem { --menuitem-image: url("../icons/movetowindow-16.svg"); } @@ -7232,25 +7189,16 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } - /*= viewMenuPopup ============================================================*/ - /*= maintenanceButtonPopup ===================================================*/ - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); } - } - @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #orgUndo { --menuitem-image: url("../icons/undo.svg"); } + /*= viewMenuPopup ============================================================*/ + /*= maintenanceButtonPopup ===================================================*/ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #orgRedo { @@ -7259,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") { @@ -7269,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") { @@ -7323,6 +7271,8 @@ } } } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url-prefix("about:addons") { @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { button[role="menuitem"] { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index e5288cf1..c1f079d8 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2218,7 +2218,7 @@ #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -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) @@ -3176,6 +3184,14 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { + :root { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } + } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), @@ -3506,12 +3522,7 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { @@ -3542,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"); @@ -3571,32 +3582,26 @@ --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"); } #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #placesContext_showInFolder, - #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #placesContext_new\:separator { --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"); @@ -3618,12 +3623,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - #newfolder { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); @@ -3637,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/add-device.svg b/icons/add-device.svg index 10fef2b2..aea41fc1 100644 --- a/icons/add-device.svg +++ b/icons/add-device.svg @@ -1,7 +1 @@ - - - - - + diff --git a/icons/arrow-between-down.svg b/icons/arrow-between-down.svg index b15ee776..e0044855 100644 --- a/icons/arrow-between-down.svg +++ b/icons/arrow-between-down.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/arrow-repeat-all.svg b/icons/arrow-repeat-all.svg index f3310212..ce59a899 100644 --- a/icons/arrow-repeat-all.svg +++ b/icons/arrow-repeat-all.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/arrow-sort-down-lines.svg b/icons/arrow-sort-down-lines.svg index c3efd486..352b448e 100644 --- a/icons/arrow-sort-down-lines.svg +++ b/icons/arrow-sort-down-lines.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/arrow-swap.svg b/icons/arrow-swap.svg index 6bdb4bf6..14e5667a 100644 --- a/icons/arrow-swap.svg +++ b/icons/arrow-swap.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/auto-fit-width.svg b/icons/auto-fit-width.svg index 6b39adec..5805d5f4 100644 --- a/icons/auto-fit-width.svg +++ b/icons/auto-fit-width.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/book-add.svg b/icons/book-add.svg index fec2a1e1..3121f768 100644 --- a/icons/book-add.svg +++ b/icons/book-add.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/book.svg b/icons/book.svg index eb196da4..66f726a6 100644 --- a/icons/book.svg +++ b/icons/book.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/bookmark-multiple.svg b/icons/bookmark-multiple.svg index 14dcee9c..bf4be954 100644 --- a/icons/bookmark-multiple.svg +++ b/icons/bookmark-multiple.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/bookmarks-toolbar-alt.svg b/icons/bookmarks-toolbar-alt.svg new file mode 100644 index 00000000..cd58f930 --- /dev/null +++ b/icons/bookmarks-toolbar-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/bookmarks-toolbar.svg b/icons/bookmarks-toolbar.svg new file mode 100644 index 00000000..2f201192 --- /dev/null +++ b/icons/bookmarks-toolbar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/bookmarksMenu-open.svg b/icons/bookmarksMenu-open.svg index 616669c2..83be211f 100644 --- a/icons/bookmarksMenu-open.svg +++ b/icons/bookmarksMenu-open.svg @@ -1,7 +1 @@ - - - - - \ No newline at end of file + diff --git a/icons/bookmarksMenu-open2.svg b/icons/bookmarksMenu-open2.svg index 4a21832c..cba1fdf6 100644 --- a/icons/bookmarksMenu-open2.svg +++ b/icons/bookmarksMenu-open2.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/bookmarksToolbar-open-alt.svg b/icons/bookmarksToolbar-open-alt.svg new file mode 100644 index 00000000..7e794b27 --- /dev/null +++ b/icons/bookmarksToolbar-open-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/bookmarksToolbar-open.svg b/icons/bookmarksToolbar-open.svg index 3ae7fa76..ad37fa63 100644 --- a/icons/bookmarksToolbar-open.svg +++ b/icons/bookmarksToolbar-open.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/broom.svg b/icons/broom.svg index 7428fada..7623bf2a 100644 --- a/icons/broom.svg +++ b/icons/broom.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/bug.svg b/icons/bug.svg index 4ee7ba9e..9ebc7982 100644 --- a/icons/bug.svg +++ b/icons/bug.svg @@ -1,5 +1 @@ - - - + diff --git a/icons/calendar-agenda.svg b/icons/calendar-agenda.svg index 7c45ae85..030e2656 100644 --- a/icons/calendar-agenda.svg +++ b/icons/calendar-agenda.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/characterEncoding.svg b/icons/characterEncoding.svg new file mode 100644 index 00000000..f730cbc0 --- /dev/null +++ b/icons/characterEncoding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/code.svg b/icons/code.svg index e9aa4fc9..3462da78 100644 --- a/icons/code.svg +++ b/icons/code.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/command-frames.svg b/icons/command-frames.svg index ceae757e..3dcb7786 100644 --- a/icons/command-frames.svg +++ b/icons/command-frames.svg @@ -1,6 +1 @@ - - - - + diff --git a/icons/command-pick.svg b/icons/command-pick.svg index 2b0ba002..e2855a64 100644 --- a/icons/command-pick.svg +++ b/icons/command-pick.svg @@ -1,7 +1 @@ - - - - - \ 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/container-openin-16.svg b/icons/container-openin-16.svg index 2ddadb39..82ce1d8a 100644 --- a/icons/container-openin-16.svg +++ b/icons/container-openin-16.svg @@ -1,9 +1 @@ - - - - - - - + diff --git a/icons/content-view.svg b/icons/content-view.svg index 6f9ac018..dcbafe19 100644 --- a/icons/content-view.svg +++ b/icons/content-view.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/copy-select.svg b/icons/copy-select.svg index f116bd15..94aab6bf 100644 --- a/icons/copy-select.svg +++ b/icons/copy-select.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/dashboard.svg b/icons/dashboard.svg index 879570be..95edcb15 100644 --- a/icons/dashboard.svg +++ b/icons/dashboard.svg @@ -1,4 +1 @@ - - \ No newline at end of file + diff --git a/icons/datarestore.svg b/icons/datarestore.svg index 34be076c..fe8d3245 100644 --- a/icons/datarestore.svg +++ b/icons/datarestore.svg @@ -1,6 +1 @@ - - - - - - + diff --git a/icons/datastore.svg b/icons/datastore.svg index ee87f8c0..2e384ef7 100644 --- a/icons/datastore.svg +++ b/icons/datastore.svg @@ -1,6 +1 @@ - - - - - - + diff --git a/icons/developer.svg b/icons/developer.svg index 4c4ea4db..4a393e97 100644 --- a/icons/developer.svg +++ b/icons/developer.svg @@ -1,6 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/device-desktop.svg b/icons/device-desktop.svg new file mode 100644 index 00000000..ce319842 --- /dev/null +++ b/icons/device-desktop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/device-phone.svg b/icons/device-phone.svg new file mode 100644 index 00000000..dcc978f3 --- /dev/null +++ b/icons/device-phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/device-tablet.svg b/icons/device-tablet.svg new file mode 100644 index 00000000..e73ccf0c --- /dev/null +++ b/icons/device-tablet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/device-tv.svg b/icons/device-tv.svg new file mode 100644 index 00000000..77ac9cef --- /dev/null +++ b/icons/device-tv.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/device-vr.svg b/icons/device-vr.svg new file mode 100644 index 00000000..2d2fd970 --- /dev/null +++ b/icons/device-vr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/dismiss-filled.svg b/icons/dismiss-filled.svg index d88e0a74..61693c45 100644 --- a/icons/dismiss-filled.svg +++ b/icons/dismiss-filled.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/document-css.svg b/icons/document-css.svg index 2a77b68f..68042b89 100644 --- a/icons/document-css.svg +++ b/icons/document-css.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/document-endnote.svg b/icons/document-endnote.svg index 2e490fac..7623de2e 100644 --- a/icons/document-endnote.svg +++ b/icons/document-endnote.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/document-landscape-split-hint.svg b/icons/document-landscape-split-hint.svg index 82954d5f..c2e09fad 100644 --- a/icons/document-landscape-split-hint.svg +++ b/icons/document-landscape-split-hint.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/document-search.svg b/icons/document-search.svg index 00688ffa..444d267c 100644 --- a/icons/document-search.svg +++ b/icons/document-search.svg @@ -1,5 +1 @@ - - - + diff --git a/icons/drawer-arrow-download.svg b/icons/drawer-arrow-download.svg index 50060f13..d328fdb2 100644 --- a/icons/drawer-arrow-download.svg +++ b/icons/drawer-arrow-download.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/edit-copy.svg b/icons/edit-copy.svg index f343d802..e2f16cc3 100644 --- a/icons/edit-copy.svg +++ b/icons/edit-copy.svg @@ -1,6 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/edit-cut.svg b/icons/edit-cut.svg new file mode 100644 index 00000000..0d80d08c --- /dev/null +++ b/icons/edit-cut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/edit-paste-go.svg b/icons/edit-paste-go.svg index f7abda41..5cac56ab 100644 --- a/icons/edit-paste-go.svg +++ b/icons/edit-paste-go.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/edit-paste-search.svg b/icons/edit-paste-search.svg index c2ab698f..cd820176 100644 --- a/icons/edit-paste-search.svg +++ b/icons/edit-paste-search.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/edit-paste.svg b/icons/edit-paste.svg new file mode 100644 index 00000000..d3eb2e78 --- /dev/null +++ b/icons/edit-paste.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/enter-fullscreen.svg b/icons/enter-fullscreen.svg index 54d76f57..48bf632d 100644 --- a/icons/enter-fullscreen.svg +++ b/icons/enter-fullscreen.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/exit-fullscreen.svg b/icons/exit-fullscreen.svg index cf4e64c5..5a26852d 100644 --- a/icons/exit-fullscreen.svg +++ b/icons/exit-fullscreen.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/eye-hide.svg b/icons/eye-hide.svg index b941bad4..767a43eb 100644 --- a/icons/eye-hide.svg +++ b/icons/eye-hide.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/eye-show.svg b/icons/eye-show.svg index c4c34440..82e364ff 100644 --- a/icons/eye-show.svg +++ b/icons/eye-show.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/eye-tracking-off.svg b/icons/eye-tracking-off.svg index 9ce8bbf9..86089dda 100644 --- a/icons/eye-tracking-off.svg +++ b/icons/eye-tracking-off.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/fluid.svg b/icons/fluid.svg index 2cffb706..6686e4f1 100644 --- a/icons/fluid.svg +++ b/icons/fluid.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/folder-globe.svg b/icons/folder-globe.svg index 65eb7e09..5325f8a1 100644 --- a/icons/folder-globe.svg +++ b/icons/folder-globe.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/folder-open.svg b/icons/folder-open.svg index bdab9848..177409b5 100644 --- a/icons/folder-open.svg +++ b/icons/folder-open.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/folder.svg b/icons/folder.svg index ee73b3a0..8b82f625 100644 --- a/icons/folder.svg +++ b/icons/folder.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/forget.svg b/icons/forget.svg new file mode 100644 index 00000000..a18d6d4d --- /dev/null +++ b/icons/forget.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/highlight.svg b/icons/highlight.svg index 74105a7b..63628f4e 100644 --- a/icons/highlight.svg +++ b/icons/highlight.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/image-add.svg b/icons/image-add.svg index 48e9bde9..05d06edc 100644 --- a/icons/image-add.svg +++ b/icons/image-add.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/image-alt-text.svg b/icons/image-alt-text.svg index af87ac28..ffca1ffe 100644 --- a/icons/image-alt-text.svg +++ b/icons/image-alt-text.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/image-arrow-counterclockwise.svg b/icons/image-arrow-counterclockwise.svg index 01a99871..52c5e74a 100644 --- a/icons/image-arrow-counterclockwise.svg +++ b/icons/image-arrow-counterclockwise.svg @@ -1,5 +1 @@ - - - - - \ No newline at end of file + diff --git a/icons/image-copy.svg b/icons/image-copy.svg index 15fe31d9..5bfcbd78 100644 --- a/icons/image-copy.svg +++ b/icons/image-copy.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/image.svg b/icons/image.svg index 33709eae..91f1190d 100644 --- a/icons/image.svg +++ b/icons/image.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/ion.svg b/icons/ion.svg new file mode 100644 index 00000000..bc819d26 --- /dev/null +++ b/icons/ion.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/key-multiple.svg b/icons/key-multiple.svg index 4a64c90c..358ff1eb 100644 --- a/icons/key-multiple.svg +++ b/icons/key-multiple.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/link-no-tracking.svg b/icons/link-no-tracking.svg new file mode 100644 index 00000000..ae243ffe --- /dev/null +++ b/icons/link-no-tracking.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/link-square.svg b/icons/link-square.svg index 36362fe2..7c04e114 100644 --- a/icons/link-square.svg +++ b/icons/link-square.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/link.svg b/icons/link.svg index cbc15a24..00be2276 100644 --- a/icons/link.svg +++ b/icons/link.svg @@ -1,6 +1 @@ - - - - + diff --git a/icons/lock-closed.svg b/icons/lock-closed.svg index 528e69fd..3a9bcf11 100644 --- a/icons/lock-closed.svg +++ b/icons/lock-closed.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/mail-inbox-all.svg b/icons/mail-inbox-all.svg index d2ba2651..6d88c4e6 100644 --- a/icons/mail-inbox-all.svg +++ b/icons/mail-inbox-all.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/mail-inbox.svg b/icons/mail-inbox.svg index 669a9c48..afa3be58 100644 --- a/icons/mail-inbox.svg +++ b/icons/mail-inbox.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/mail.svg b/icons/mail.svg new file mode 100644 index 00000000..afb55cde --- /dev/null +++ b/icons/mail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/menu-check.svg b/icons/menu-check.svg index 3c6f422e..3b34bd99 100644 --- a/icons/menu-check.svg +++ b/icons/menu-check.svg @@ -1,6 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/movetowindow-16.svg b/icons/movetowindow-16.svg index 05846772..c2fe2f85 100644 --- a/icons/movetowindow-16.svg +++ b/icons/movetowindow-16.svg @@ -1,7 +1 @@ - - - - - + diff --git a/icons/new-tab-forward-photon.svg b/icons/new-tab-forward-photon.svg new file mode 100644 index 00000000..7398fc90 --- /dev/null +++ b/icons/new-tab-forward-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/new-tab-forward.svg b/icons/new-tab-forward.svg index 6c876421..492f2d74 100644 --- a/icons/new-tab-forward.svg +++ b/icons/new-tab-forward.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/new-tab-multiple-photon.svg b/icons/new-tab-multiple-photon.svg new file mode 100644 index 00000000..1830e7e0 --- /dev/null +++ b/icons/new-tab-multiple-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/new-tab-multiple.svg b/icons/new-tab-multiple.svg index 9007367b..0a236997 100644 --- a/icons/new-tab-multiple.svg +++ b/icons/new-tab-multiple.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/new-tab-photon.svg b/icons/new-tab-photon.svg new file mode 100644 index 00000000..ecf73982 --- /dev/null +++ b/icons/new-tab-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/new-tab-skip-forward-photon.svg b/icons/new-tab-skip-forward-photon.svg new file mode 100644 index 00000000..a2383b15 --- /dev/null +++ b/icons/new-tab-skip-forward-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/new-tab-skip-forward.svg b/icons/new-tab-skip-forward.svg index 9ab9e8a8..1419c752 100644 --- a/icons/new-tab-skip-forward.svg +++ b/icons/new-tab-skip-forward.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/new-tab.svg b/icons/new-tab.svg new file mode 100644 index 00000000..04d67a16 --- /dev/null +++ b/icons/new-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/password-hide.svg b/icons/password-hide.svg index 10e6271c..767a43eb 100644 --- a/icons/password-hide.svg +++ b/icons/password-hide.svg @@ -1,9 +1 @@ - - - - - - - + diff --git a/icons/password.svg b/icons/password.svg index 43d6051e..91f2b6ff 100644 --- a/icons/password.svg +++ b/icons/password.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/paste-text.svg b/icons/paste-text.svg new file mode 100644 index 00000000..eee72420 --- /dev/null +++ b/icons/paste-text.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/paste-url.svg b/icons/paste-url.svg new file mode 100644 index 00000000..17f72323 --- /dev/null +++ b/icons/paste-url.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/performance.svg b/icons/performance.svg index b5b4a79d..775c0788 100644 --- a/icons/performance.svg +++ b/icons/performance.svg @@ -1,7 +1 @@ - - - - - + diff --git a/icons/play.svg b/icons/play.svg index a38bb48c..d5b67903 100644 --- a/icons/play.svg +++ b/icons/play.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/plug-disconnected.svg b/icons/plug-disconnected.svg index 4d978ab7..c3ab1f4a 100644 --- a/icons/plug-disconnected.svg +++ b/icons/plug-disconnected.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/quit.svg b/icons/quit.svg index 6478b62e..fcef680f 100644 --- a/icons/quit.svg +++ b/icons/quit.svg @@ -1,6 +1 @@ - - - - + diff --git a/icons/redo.svg b/icons/redo.svg index 63a43453..b0d1f360 100644 --- a/icons/redo.svg +++ b/icons/redo.svg @@ -1,4 +1 @@ - - \ No newline at end of file + diff --git a/icons/resize-image.svg b/icons/resize-image.svg index d5ccbb10..22fcd4de 100644 --- a/icons/resize-image.svg +++ b/icons/resize-image.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/resize.svg b/icons/resize.svg index 43e4aa14..06f61aef 100644 --- a/icons/resize.svg +++ b/icons/resize.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/restore-session.svg b/icons/restore-session.svg index 08e2b4e0..33dd8101 100644 --- a/icons/restore-session.svg +++ b/icons/restore-session.svg @@ -1,6 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/screenshot-1.svg b/icons/screenshot-1.svg new file mode 100644 index 00000000..5221408a --- /dev/null +++ b/icons/screenshot-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/screenshot.svg b/icons/screenshot.svg index 1f27aa53..bc3b7407 100644 --- a/icons/screenshot.svg +++ b/icons/screenshot.svg @@ -1,5 +1 @@ - - - + diff --git a/icons/select-all-on.svg b/icons/select-all-on.svg index 94771c33..72bd1345 100644 --- a/icons/select-all-on.svg +++ b/icons/select-all-on.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/send-to-device.svg b/icons/send-to-device.svg index cef1604e..2adc9082 100644 --- a/icons/send-to-device.svg +++ b/icons/send-to-device.svg @@ -1,7 +1 @@ - - - - - + diff --git a/icons/send.svg b/icons/send.svg index 573ed559..3e2a9e23 100644 --- a/icons/send.svg +++ b/icons/send.svg @@ -1,44 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/icons/shield-task.svg b/icons/shield-task.svg index 662087e2..07119ea3 100644 --- a/icons/shield-task.svg +++ b/icons/shield-task.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/sign-out.svg b/icons/sign-out.svg index a23657fe..d810081c 100644 --- a/icons/sign-out.svg +++ b/icons/sign-out.svg @@ -1,4 +1 @@ - - \ No newline at end of file + diff --git a/icons/star-line-horizontal.svg b/icons/star-line-horizontal.svg index 734bebad..d41cbd13 100644 --- a/icons/star-line-horizontal.svg +++ b/icons/star-line-horizontal.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/tab-copy-photon.svg b/icons/tab-copy-photon.svg new file mode 100644 index 00000000..dc5ca7d3 --- /dev/null +++ b/icons/tab-copy-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/tab-copy.svg b/icons/tab-copy.svg index 3d3bad5b..56f6ca84 100644 --- a/icons/tab-copy.svg +++ b/icons/tab-copy.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/tab-desktop-multiple-bottom.svg b/icons/tab-desktop-multiple-bottom.svg index 97457b4a..3f4dedeb 100644 --- a/icons/tab-desktop-multiple-bottom.svg +++ b/icons/tab-desktop-multiple-bottom.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/tab-desktop-multiple.svg b/icons/tab-desktop-multiple.svg new file mode 100644 index 00000000..17381f75 --- /dev/null +++ b/icons/tab-desktop-multiple.svg @@ -0,0 +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/tab-unload.svg b/icons/tab-unload.svg index 8907267b..eab65e24 100644 --- a/icons/tab-unload.svg +++ b/icons/tab-unload.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/tab.svg b/icons/tab.svg index 1d13dd15..3839ca04 100644 --- a/icons/tab.svg +++ b/icons/tab.svg @@ -1,6 +1 @@ - - - - \ No newline at end of file + diff --git a/icons/tag-open.svg b/icons/tag-open.svg index fc55312d..8d22a0cd 100644 --- a/icons/tag-open.svg +++ b/icons/tag-open.svg @@ -1,6 +1 @@ - - - - + diff --git a/icons/tag.svg b/icons/tag.svg new file mode 100644 index 00000000..930cc3a3 --- /dev/null +++ b/icons/tag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/text-direction-horizontal-ltr.svg b/icons/text-direction-horizontal-ltr.svg index 6c6ab8d1..de255bbe 100644 --- a/icons/text-direction-horizontal-ltr.svg +++ b/icons/text-direction-horizontal-ltr.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/text-number-format.svg b/icons/text-number-format.svg index 7f20275e..74a33b96 100644 --- a/icons/text-number-format.svg +++ b/icons/text-number-format.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/text-proofing-tools.svg b/icons/text-proofing-tools.svg index 9247c70e..a1a433e0 100644 --- a/icons/text-proofing-tools.svg +++ b/icons/text-proofing-tools.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/text-sort-ascending.svg b/icons/text-sort-ascending.svg index d5613d13..013c393f 100644 --- a/icons/text-sort-ascending.svg +++ b/icons/text-sort-ascending.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/time-picker.svg b/icons/time-picker.svg index 098e21f8..3f9001c1 100644 --- a/icons/time-picker.svg +++ b/icons/time-picker.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/timer10.svg b/icons/timer10.svg index e6311bb5..b31c0f9b 100644 --- a/icons/timer10.svg +++ b/icons/timer10.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/tool-accessibility.svg b/icons/tool-accessibility.svg new file mode 100644 index 00000000..5cd3ecd4 --- /dev/null +++ b/icons/tool-accessibility.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/toolbar.svg b/icons/toolbar.svg index f9f2c8ee..0d66c2ad 100644 --- a/icons/toolbar.svg +++ b/icons/toolbar.svg @@ -1,4 +1 @@ - - + diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg index 6d647578..bc63a411 100644 --- a/icons/toolbarButton-download.svg +++ b/icons/toolbarButton-download.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/toolbarButton-upload.svg b/icons/toolbarButton-upload.svg index 723f6fb9..88d3f784 100644 --- a/icons/toolbarButton-upload.svg +++ b/icons/toolbarButton-upload.svg @@ -1,4 +1 @@ - - - - + diff --git a/icons/toolbox.svg b/icons/toolbox.svg index 7e1a6bb4..5e29c6c9 100644 --- a/icons/toolbox.svg +++ b/icons/toolbox.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/icons/undo.svg b/icons/undo.svg index 5f6c0b69..31263da0 100644 --- a/icons/undo.svg +++ b/icons/undo.svg @@ -1,6 +1 @@ - - - - + diff --git a/icons/video-clip.svg b/icons/video-clip.svg index 65656f1b..557ca62d 100644 --- a/icons/video-clip.svg +++ b/icons/video-clip.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/video-snapshot.svg b/icons/video-snapshot.svg index b44bccec..51e3d1c8 100644 --- a/icons/video-snapshot.svg +++ b/icons/video-snapshot.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/video.svg b/icons/video.svg index bce7022b..bd135606 100644 --- a/icons/video.svg +++ b/icons/video.svg @@ -1,3 +1 @@ - - - + diff --git a/icons/whatsnew.svg b/icons/whatsnew.svg index 30d95ab5..77080445 100644 --- a/icons/whatsnew.svg +++ b/icons/whatsnew.svg @@ -1,10 +1 @@ - - - - - - - - \ No newline at end of file + diff --git a/icons/window-dev-tools.svg b/icons/window-dev-tools.svg index b066ab49..5d811718 100644 --- a/icons/window-dev-tools.svg +++ b/icons/window-dev-tools.svg @@ -1,5 +1 @@ - - - + diff --git a/icons/wrench-filled.svg b/icons/wrench-filled.svg index d02257d4..4a393e97 100644 --- a/icons/wrench-filled.svg +++ b/icons/wrench-filled.svg @@ -1,6 +1 @@ - - - - + diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss index b182c50c..aa18c877 100644 --- a/src/contents/_context_menu.scss +++ b/src/contents/_context_menu.scss @@ -1,3 +1,8 @@ +@import "../icons/shared"; +:root { + @include initIcons; +} + @include moz-document( url "chrome://browser/content/places/places.xhtml", url "about:downloads" 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 38c116de..15b11806 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -1,10 +1,26 @@ -/** Library - Icons Replace ***************************************************/ -@include Option("userChrome.icon.library") { - @import "../library/chrome"; -} - -/** Panel - Icons *************************************************************/ +@import "shared"; +/** Icons - List **************************************************************/ :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-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); + --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.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-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 { @@ -14,6 +30,19 @@ } } } + + +.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"; +} + +/** Panel - Icons *************************************************************/ @include Option("userChrome.icon.panel") { @import "layout/panel"; @import "panel"; diff --git a/src/icons/_library.scss b/src/icons/_library.scss index 7ada4333..a4791edb 100644 --- a/src/icons/_library.scss +++ b/src/icons/_library.scss @@ -3,10 +3,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - @include Option("userChrome.icon.library") { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); @@ -22,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..f48eae2d 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,12 +115,42 @@ 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"); } @include Option("userChrome.icon.panel_full") { #appMenu-more-button2 { - list-style-image: url("chrome://browser/skin/ion.svg"); + list-style-image: url("../icons/ion.svg"); } } @include Option("userChrome.icon.panel_full", "userChrome.icon.panel_photon") { @@ -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/_shared.scss b/src/icons/_shared.scss new file mode 100644 index 00000000..ab554336 --- /dev/null +++ b/src/icons/_shared.scss @@ -0,0 +1,6 @@ +@mixin initIcons() { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + @include Option("userChrome.icon.library") { + --uc-folder-icon: url("../icons/folder.svg"); + } +} diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 8201c054..f3b34406 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,11 +51,17 @@ --menuitem-image: url("../icons/pocket-outline.svg"); } #context-copyemail { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + --menuitem-image: url("../icons/mail.svg"); +} +#context-copyphone { + --menuitem-image: url("../icons/device-phone.svg"); } #context-copylink { --menuitem-image: url("../icons/link.svg"); } +#context-stripOnShareLink { + --menuitem-image: url("../icons/link-no-tracking.svg"); +} #context-sendlinktodevice { --menuitem-image: url("../icons/send-to-device.svg"); } @@ -129,7 +135,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 +182,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 +204,7 @@ } #context-take-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-keywordfield { @@ -236,7 +242,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 +276,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 +298,7 @@ } #context-take-frame-screenshot { - --menuitem-image: url("chrome://browser/skin/screenshot.svg"); + --menuitem-image: url("../icons/screenshot-1.svg"); } #context-viewframesource { @@ -312,20 +318,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/_downloads.scss b/src/icons/context_menu/_downloads.scss index 42736333..0d62f2d2 100644 --- a/src/icons/context_menu/_downloads.scss +++ b/src/icons/context_menu/_downloads.scss @@ -20,10 +20,7 @@ --menuitem-image: url("../icons/fluid.svg"); } .downloadShowMenuItem { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - @include Option("userChrome.icon.library") { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #downloadsContextMenu > menuitem { 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 b6e6d56f..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 { @@ -54,17 +54,14 @@ } #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - @include Option("userChrome.icon.library") { - --menuitem-image: url("../icons/folder.svg"); - } + --menuitem-image: var(--uc-folder-icon); } #placesContext_new\:separator { --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 { 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 140427ba..1e6e15bb 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -4,7 +4,7 @@ } #openprofiledir { - list-style-image: url("../icons/folder.svg"); + list-style-image: var(--uc-folder-icon); } } @include Option("userChrome.icon.menu") { @@ -27,7 +27,7 @@ --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } &[data-l10n-id="open-css-folder"] { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: var(--uc-folder-icon); } &[data-l10n-id="edit-userChromeCss-editor"] { --menuitem-image: url("chrome://browser/skin/window.svg"); @@ -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 931b7e87..fa6f42ff 100644 --- a/src/library/_folder_icons.scss +++ b/src/library/_folder_icons.scss @@ -9,7 +9,7 @@ #editBMPanel_folderMenuList .folder-icon:not([id]), /* Download Popup */ .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; + list-style-image: var(--uc-folder-icon) !important; } /* Standard Folder - Open */ @@ -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 */