From 0e235c685498d9f52c8929c3e65193e6720f8924 Mon Sep 17 00:00:00 2001 From: Mark Striemer Date: Fri, 15 Mar 2019 19:19:14 +0000 Subject: [PATCH] Bug 1525193 - Rename page-action.svg to more.svg, move to toolkit r=dao Differential Revision: https://phabricator.services.mozilla.com/D21293 --HG-- rename : browser/themes/shared/icons/page-action.svg => toolkit/themes/shared/icons/more.svg extra : moz-landing-system : lando --- .../CollapsibleSection/_CollapsibleSection.scss | 2 +- .../components/newtab/content-src/styles/_variables.scss | 2 +- browser/components/newtab/css/activity-stream-linux.css | 8 ++++---- browser/components/newtab/css/activity-stream-mac.css | 8 ++++---- browser/components/newtab/css/activity-stream-windows.css | 8 ++++---- browser/themes/shared/jar.inc.mn | 1 - browser/themes/shared/urlbar-searchbar.inc.css | 2 +- .../themes/shared/icons/more.svg | 0 toolkit/themes/shared/jar.inc.mn | 1 + 9 files changed, 16 insertions(+), 16 deletions(-) rename browser/themes/shared/icons/page-action.svg => toolkit/themes/shared/icons/more.svg (100%) diff --git a/browser/components/newtab/content-src/components/CollapsibleSection/_CollapsibleSection.scss b/browser/components/newtab/content-src/components/CollapsibleSection/_CollapsibleSection.scss index 0b2338fc4531..96234c22032d 100644 --- a/browser/components/newtab/content-src/components/CollapsibleSection/_CollapsibleSection.scss +++ b/browser/components/newtab/content-src/components/CollapsibleSection/_CollapsibleSection.scss @@ -51,7 +51,7 @@ position: relative; .context-menu-button { - background: url('chrome://browser/skin/page-action.svg') no-repeat right center; + background: url('chrome://global/skin/icons/more.svg') no-repeat right center; border: 0; cursor: pointer; fill: var(--newtab-section-header-text-color); diff --git a/browser/components/newtab/content-src/styles/_variables.scss b/browser/components/newtab/content-src/styles/_variables.scss index c64cea70dedf..3fa32e60e4e0 100644 --- a/browser/components/newtab/content-src/styles/_variables.scss +++ b/browser/components/newtab/content-src/styles/_variables.scss @@ -155,7 +155,7 @@ $textbox-shadow-size: 4px; .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url('chrome://browser/skin/page-action.svg'); + background-image: url('chrome://global/skin/icons/more.svg'); background-position: 55%; border: $border-primary; border-radius: 100%; diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css index 66b800c656b1..4d36d782036c 100644 --- a/browser/components/newtab/css/activity-stream-linux.css +++ b/browser/components/newtab/css/activity-stream-linux.css @@ -508,7 +508,7 @@ main { .top-site-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1298,7 +1298,7 @@ main { .card-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1590,7 +1590,7 @@ main { margin-bottom: 13px; position: relative; } .collapsible-section .section-top-bar .context-menu-button { - background: url("chrome://browser/skin/page-action.svg") no-repeat right center; + background: url("chrome://global/skin/icons/more.svg") no-repeat right center; border: 0; cursor: pointer; fill: var(--newtab-section-header-text-color); @@ -2491,7 +2491,7 @@ main { .ds-card .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css index 2a2365585788..c3699423ba62 100644 --- a/browser/components/newtab/css/activity-stream-mac.css +++ b/browser/components/newtab/css/activity-stream-mac.css @@ -511,7 +511,7 @@ main { .top-site-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1301,7 +1301,7 @@ main { .card-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1593,7 +1593,7 @@ main { margin-bottom: 13px; position: relative; } .collapsible-section .section-top-bar .context-menu-button { - background: url("chrome://browser/skin/page-action.svg") no-repeat right center; + background: url("chrome://global/skin/icons/more.svg") no-repeat right center; border: 0; cursor: pointer; fill: var(--newtab-section-header-text-color); @@ -2494,7 +2494,7 @@ main { .ds-card .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css index 7732f72c60a7..859222d97b6b 100644 --- a/browser/components/newtab/css/activity-stream-windows.css +++ b/browser/components/newtab/css/activity-stream-windows.css @@ -508,7 +508,7 @@ main { .top-site-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1298,7 +1298,7 @@ main { .card-outer .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; @@ -1590,7 +1590,7 @@ main { margin-bottom: 13px; position: relative; } .collapsible-section .section-top-bar .context-menu-button { - background: url("chrome://browser/skin/page-action.svg") no-repeat right center; + background: url("chrome://global/skin/icons/more.svg") no-repeat right center; border: 0; cursor: pointer; fill: var(--newtab-section-header-text-color); @@ -2491,7 +2491,7 @@ main { .ds-card .context-menu-button { background-clip: padding-box; background-color: var(--newtab-contextmenu-button-color); - background-image: url("chrome://browser/skin/page-action.svg"); + background-image: url("chrome://global/skin/icons/more.svg"); background-position: 55%; border: 1px solid var(--newtab-border-primary-color); border-radius: 100%; diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 7372f62ebf05..9986b96d931d 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -175,7 +175,6 @@ skin/classic/browser/new-tab.svg (../shared/icons/new-tab.svg) skin/classic/browser/new-window.svg (../shared/icons/new-window.svg) skin/classic/browser/open.svg (../shared/icons/open.svg) - skin/classic/browser/page-action.svg (../shared/icons/page-action.svg) skin/classic/browser/pin-tab.svg (../shared/icons/pin-tab.svg) skin/classic/browser/pocket.svg (../shared/icons/pocket.svg) skin/classic/browser/pocket-animation.svg (../shared/icons/pocket-animation.svg) diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css index 1a8082e61ccb..c8069387f1e0 100644 --- a/browser/themes/shared/urlbar-searchbar.inc.css +++ b/browser/themes/shared/urlbar-searchbar.inc.css @@ -358,7 +358,7 @@ #pageActionButton, .share-more-button { - list-style-image: url("chrome://browser/skin/page-action.svg"); + list-style-image: url("chrome://global/skin/icons/more.svg"); } @keyframes bookmark-animation { diff --git a/browser/themes/shared/icons/page-action.svg b/toolkit/themes/shared/icons/more.svg similarity index 100% rename from browser/themes/shared/icons/page-action.svg rename to toolkit/themes/shared/icons/more.svg diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index 9aac6b564d18..02a178c0a036 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -41,6 +41,7 @@ toolkit.jar: skin/classic/global/icons/info.svg (../../shared/incontent-icons/info.svg) skin/classic/global/icons/loading.png (../../shared/icons/loading.png) skin/classic/global/icons/loading@2x.png (../../shared/icons/loading@2x.png) + skin/classic/global/icons/more.svg (../../shared/icons/more.svg) skin/classic/global/icons/performance.svg (../../shared/icons/performance.svg) skin/classic/global/icons/resizer.svg (../../shared/icons/resizer.svg) skin/classic/global/icons/shortcut.svg (../../shared/icons/shortcut.svg)