Bug 1700124 - de-duplicate add (+) icons r=thecount,harry,desktop-theme-reviewers

* Rename toolkit's add.svg to plus.svg, use it for the zoom-in buttons and about:newtab's add icon

Differential Revision: https://phabricator.services.mozilla.com/D118627

Author: sfoster

browser/components/newtab/content-src/styles/_icons.scss

@@ -189,7 +189,7 @@
   }
 
   &.icon-add {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-add-16.svg');
+    background-image: url('chrome://global/skin/icons/plus.svg');
   }
 
   &.icon-minimize {

browser/components/newtab/css/activity-stream-linux.css

@@ -346,7 +346,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://global/skin/icons/arrow-up.svg");
 }
 .icon.icon-add {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-add-16.svg");
+  background-image: url("chrome://global/skin/icons/plus.svg");
 }
 .icon.icon-minimize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-minimize-16.svg");

browser/components/newtab/css/activity-stream-mac.css

@@ -350,7 +350,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://global/skin/icons/arrow-up.svg");
 }
 .icon.icon-add {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-add-16.svg");
+  background-image: url("chrome://global/skin/icons/plus.svg");
 }
 .icon.icon-minimize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-minimize-16.svg");

browser/components/newtab/css/activity-stream-windows.css

@@ -346,7 +346,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://global/skin/icons/arrow-up.svg");
 }
 .icon.icon-add {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-add-16.svg");
+  background-image: url("chrome://global/skin/icons/plus.svg");
 }
 .icon.icon-minimize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-minimize-16.svg");

browser/components/newtab/data/content/assets/glyph-add-16.svg

@@ -120,7 +120,7 @@ var gBuiltInInputs = {
   },
   NewTab: {
     title: "new-tab",
-    image: "chrome://global/skin/icons/add.svg",
+    image: "chrome://global/skin/icons/plus.svg",
     type: kInputTypes.BUTTON,
     callback: () => execCommand("cmd_newNavigatorTabNoEvent"),
   },

browser/components/touchbar/MacTouchBar.js

@@ -118,10 +118,6 @@ browser/chrome/browser/skin/classic/browser/customize.svg
 browser/features/[email protected]/icons/lightbulb.svg
 chrome/toolkit/skin/classic/global/icons/lightbulb.svg
 
-# Bug 1700124 - De-duplicate browser/themes/shared icons
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-add-16.svg
-browser/chrome/browser/skin/classic/browser/zoom-in.svg
-
 # Bug 1710546 - Bundle Firefox extension as a builtin addon Nighly only
 # We plan to remove this duplicity after Firefox Translations become pref'd on
 browser/chrome/browser/builtin-addons/translations/wasm/cld-worker.js.mem

browser/installer/allowed-dupes.mn

@@ -259,7 +259,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left {
   min-height: 24px;
   height: 24px;
   color: inherit;
-  list-style-image: url("chrome://global/skin/icons/add.svg");
+  list-style-image: url("chrome://global/skin/icons/plus.svg");
 }
 
 #editBMPanel_newFolderButton:hover {

browser/themes/osx/browser.css

@@ -185,7 +185,6 @@
   skin/classic/browser/tab.svg                        (../shared/icons/tab.svg)
   skin/classic/browser/whatsnew.svg                   (../shared/icons/whatsnew.svg)
   skin/classic/browser/window.svg                     (../shared/icons/window.svg)
-  skin/classic/browser/zoom-in.svg                    (../shared/icons/zoom-in.svg)
   skin/classic/browser/zoom-out.svg                   (../shared/icons/zoom-out.svg)
   skin/classic/browser/ion.svg                        (../shared/icons/ion.svg)
 

browser/themes/shared/icons/zoom-in.svg

@@ -690,7 +690,7 @@
 
 #tabs-newtab-button,
 #TabsToolbar #new-tab-button {
-  list-style-image: url(chrome://global/skin/icons/add.svg);
+  list-style-image: url(chrome://global/skin/icons/plus.svg);
 }
 
 /* All tabs button and menupopup */

browser/themes/shared/jar.inc.mn

@@ -335,7 +335,7 @@ toolbar[brighttext]:-moz-lwtheme {
 }
 
 #zoom-in-button {
-  list-style-image: url("chrome://browser/skin/zoom-in.svg");
+  list-style-image: url("chrome://global/skin/icons/plus.svg");
 }
 
 #zoom-in-button > .toolbarbutton-icon {

browser/themes/shared/tabs.inc.css

@@ -228,7 +228,7 @@ td.cell-value > form > input[type="number"] {
 }
 
 .button-add {
-  background-image: url("chrome://global/skin/icons/add.svg");
+  background-image: url("chrome://global/skin/icons/plus.svg");
 }
 
 .button-save {

browser/themes/shared/toolbarbutton-icons.inc.css

@@ -30,7 +30,6 @@ toolkit.jar:
   skin/classic/global/numberinput.css                      (../../shared/numberinput.css)
   skin/classic/global/in-content/info-pages.css            (../../shared/in-content/info-pages.css)
   skin/classic/global/in-content/toggle-button.css         (../../shared/in-content/toggle-button.css)
-  skin/classic/global/icons/add.svg                        (../../shared/icons/add.svg)
   skin/classic/global/icons/arrow-left.svg                 (../../shared/icons/arrow-left.svg)
   skin/classic/global/icons/arrow-right.svg                (../../shared/icons/arrow-right.svg)
   skin/classic/global/icons/autoscroll.svg                 (../../shared/icons/autoscroll.svg)
@@ -63,6 +62,7 @@ toolkit.jar:
   skin/classic/global/icons/performance.svg                (../../shared/icons/performance.svg)
   skin/classic/global/icons/plugin.svg                     (../../shared/icons/plugin.svg)
   skin/classic/global/icons/plugin-blocked.svg             (../../shared/icons/plugin-blocked.svg)
+  skin/classic/global/icons/plus.svg                       (../../shared/icons/plus.svg)
   skin/classic/global/icons/pocket.svg                     (../../shared/icons/pocket.svg)
   skin/classic/global/icons/print.svg                      (../../shared/icons/print.svg)
   skin/classic/global/icons/undo.svg                       (../../shared/icons/undo.svg)