From fb695f5c5e000b59d3b5c309d0a66731112258ca Mon Sep 17 00:00:00 2001 From: aarushivij Date: Mon, 30 Mar 2020 18:54:46 +0000 Subject: [PATCH] Bug 1562940 - Icon chrome://browser/skin/identity-icon.svg should be in toolkit r=mconley Differential Revision: https://phabricator.services.mozilla.com/D68684 --HG-- rename : browser/themes/shared/identity-block/identity-icon.svg => toolkit/themes/shared/icons/identity-icon.svg extra : moz-landing-system : lando --- .../test/siteIdentity/browser_identityIcon_img_url.js | 10 +++++----- .../shared/identity-block/identity-block.inc.css | 2 +- .../themes/shared/incontentprefs/preferences.inc.css | 8 ++++---- browser/themes/shared/incontentprefs/privacy.css | 2 +- browser/themes/shared/jar.inc.mn | 1 - browser/themes/shared/places/editBookmarkPanel.inc.css | 2 +- .../themes/shared/icons}/identity-icon.svg | 0 toolkit/themes/shared/in-content/common.inc.css | 2 +- toolkit/themes/shared/jar.inc.mn | 1 + 9 files changed, 14 insertions(+), 14 deletions(-) rename {browser/themes/shared/identity-block => toolkit/themes/shared/icons}/identity-icon.svg (100%) diff --git a/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js b/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js index d8e3b31dab03..2257e2dcf207 100644 --- a/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js +++ b/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js @@ -30,7 +30,7 @@ const TEST_CASES = [ { type: "non-chrome about page", testURL: "about:about", - img_url: `url("chrome://browser/skin/identity-icon.svg")`, + img_url: `url("chrome://global/skin/icons/identity-icon.svg")`, }, { type: "chrome about page", @@ -40,7 +40,7 @@ const TEST_CASES = [ { type: "file", testURL: "dummy_page.html", - img_url: `url("chrome://browser/skin/identity-icon.svg")`, + img_url: `url("chrome://global/skin/icons/identity-icon.svg")`, }, { type: "mixedPassiveContent", @@ -60,12 +60,12 @@ const TEST_CASES = [ { type: "localhost", testURL: "http://127.0.0.1", - img_url: `url("chrome://browser/skin/identity-icon.svg")`, + img_url: `url("chrome://global/skin/icons/identity-icon.svg")`, }, { type: "localhost + http frame", testURL: kBaseURILocalhost + "file_csp_block_all_mixedcontent.html", - img_url: `url("chrome://browser/skin/identity-icon.svg")`, + img_url: `url("chrome://global/skin/icons/identity-icon.svg")`, }, { type: "data URI", @@ -81,7 +81,7 @@ const TEST_CASES = [ type: "view-source HTTPS", testURL: "view-source:https://example.com/", // TODO this will get a secure treatment with bug 1496844. - img_url: `url("chrome://browser/skin/identity-icon.svg")`, + img_url: `url("chrome://global/skin/icons/identity-icon.svg")`, }, ]; diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index 1751f5ee2c81..0868638bc48e 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -135,7 +135,7 @@ /* MAIN IDENTITY ICON */ #identity-icon { margin-inline-start: 0; - list-style-image: url(chrome://browser/skin/identity-icon.svg); + list-style-image: url(chrome://global/skin/icons/identity-icon.svg); } #identity-box[pageproxystate="valid"].chromeUI > #identity-icon { diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css index 16665d387ebb..7a279f7a3d94 100644 --- a/browser/themes/shared/incontentprefs/preferences.inc.css +++ b/browser/themes/shared/incontentprefs/preferences.inc.css @@ -253,7 +253,7 @@ button > hbox > label { .info-panel > description, .extension-controlled > description { line-height: 16px; - background: url(chrome://browser/skin/identity-icon.svg) 10px 14px no-repeat; + background: url(chrome://global/skin/icons/identity-icon.svg) 10px 14px no-repeat; padding: 10px; padding-inline-start: 32px; } @@ -859,14 +859,14 @@ image.update-throbber { } .info-icon { - list-style-image: url("chrome://browser/skin/identity-icon.svg"); + list-style-image: url("chrome://global/skin/icons/identity-icon.svg"); width: 16px; height: 16px; margin-top: calc((32px - 16px) / 2); } .info-icon-telemetry { - list-style-image: url("chrome://browser/skin/identity-icon.svg"); + list-style-image: url("chrome://global/skin/icons/identity-icon.svg"); width: 16px; height: 16px; margin-inline: 2px 8px; @@ -1048,7 +1048,7 @@ menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .me padding-inline-start: 30px; margin-block-start: 20px; line-height: 20px; - background-image: url("chrome://browser/skin/identity-icon.svg"); + background-image: url("chrome://global/skin/icons/identity-icon.svg"); background-position-x: left 2px; background-position-y: top 2px; background-size: 16px 16px; diff --git a/browser/themes/shared/incontentprefs/privacy.css b/browser/themes/shared/incontentprefs/privacy.css index 6546827b08b0..453b2898234f 100644 --- a/browser/themes/shared/incontentprefs/privacy.css +++ b/browser/themes/shared/incontentprefs/privacy.css @@ -200,7 +200,7 @@ } .content-blocking-reload-desc-container > .content-blocking-info-image { - list-style-image: url(chrome://browser/skin/identity-icon.svg); + list-style-image: url(chrome://global/skin/icons/identity-icon.svg); margin-inline-end: 12px; margin-top: 0.4em; flex-shrink: 0; diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index c50ebb4852d6..c28f411575a1 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -58,7 +58,6 @@ skin/classic/browser/connection-secure.svg (../shared/identity-block/connection-secure.svg) skin/classic/browser/connection-mixed-passive-loaded.svg (../shared/identity-block/connection-mixed-passive-loaded.svg) skin/classic/browser/connection-mixed-active-loaded.svg (../shared/identity-block/connection-mixed-active-loaded.svg) - skin/classic/browser/identity-icon.svg (../shared/identity-block/identity-icon.svg) skin/classic/browser/info.svg (../shared/info.svg) skin/classic/browser/newInstall.css (../shared/newInstall.css) skin/classic/browser/newInstallPage.css (../shared/newInstallPage.css) diff --git a/browser/themes/shared/places/editBookmarkPanel.inc.css b/browser/themes/shared/places/editBookmarkPanel.inc.css index c06b03f854ec..bb40bd4769a0 100644 --- a/browser/themes/shared/places/editBookmarkPanel.inc.css +++ b/browser/themes/shared/places/editBookmarkPanel.inc.css @@ -31,7 +31,7 @@ } .panel-info-button > image { - list-style-image: url(chrome://browser/skin/identity-icon.svg); + list-style-image: url(chrome://global/skin/icons/identity-icon.svg); -moz-context-properties: fill, fill-opacity; fill: currentColor; fill-opacity: var(--toolbarbutton-icon-fill-opacity); diff --git a/browser/themes/shared/identity-block/identity-icon.svg b/toolkit/themes/shared/icons/identity-icon.svg similarity index 100% rename from browser/themes/shared/identity-block/identity-icon.svg rename to toolkit/themes/shared/icons/identity-icon.svg diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index 5f70a5cd6803..8848fb9f8ef1 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -949,7 +949,7 @@ xul|treechildren::-moz-tree-image(selected) { } .message-bar-icon { - list-style-image: url("chrome://browser/skin/identity-icon.svg"); + list-style-image: url("chrome://global/skin/icons/identity-icon.svg"); width: 24px; height: 24px; padding: 4px; diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index 2f346b2b232a..6bbc29b9e36c 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -51,6 +51,7 @@ toolkit.jar: skin/classic/global/icons/performance.svg (../../shared/icons/performance.svg) skin/classic/global/pictureinpicture/pause.svg (../../shared/pictureinpicture/pause.svg) skin/classic/global/pictureinpicture/play.svg (../../shared/pictureinpicture/play.svg) + skin/classic/global/icons/identity-icon.svg (../../shared/icons/identity-icon.svg) skin/classic/global/icons/resizer.svg (../../shared/icons/resizer.svg) skin/classic/global/icons/shortcut.svg (../../shared/icons/shortcut.svg) skin/classic/global/icons/spinner-arrow-down.svg (../../shared/icons/spinner-arrow-down.svg)