Bug 1700124 - de-duplicate add (+) icons r=thecount,harry,desktop-theme-reviewers
authorSam Foster <sfoster@mozilla.com>
Thu, 08 Jul 2021 18:52:40 +0000
changeset 585122 81168fdd4e187c1f8d808a4c3a0a06b5a2d0780f
parent 585121 6fa18226d738435952f76e2eeb7ae69ebdca1e2f
child 585123 da8e891332181ec873472446271f6ee969cd3ae8
push id38596
push usermalexandru@mozilla.com
push dateFri, 09 Jul 2021 03:52:03 +0000
treeherdermozilla-central@9b0fc6f1555b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersthecount, harry, desktop-theme-reviewers
bugs1700124
milestone91.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
browser/components/newtab/content-src/styles/_icons.scss
browser/components/newtab/css/activity-stream-linux.css
browser/components/newtab/css/activity-stream-mac.css
browser/components/newtab/css/activity-stream-windows.css
browser/components/newtab/data/content/assets/glyph-add-16.svg
browser/components/touchbar/MacTouchBar.js
browser/installer/allowed-dupes.mn
browser/themes/osx/browser.css
browser/themes/shared/icons/zoom-in.svg
browser/themes/shared/jar.inc.mn
browser/themes/shared/tabs.inc.css
browser/themes/shared/toolbarbutton-icons.inc.css
toolkit/components/aboutconfig/content/aboutconfig.css
toolkit/themes/shared/icons/add.svg
toolkit/themes/shared/icons/plus.svg
toolkit/themes/shared/jar.inc.mn
--- a/browser/components/newtab/content-src/styles/_icons.scss
+++ b/browser/components/newtab/content-src/styles/_icons.scss
@@ -184,17 +184,17 @@
     }
   }
 
   &.icon-arrowhead-up {
     background-image: url('chrome://global/skin/icons/arrow-up.svg');
   }
 
   &.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 {
     background-image: url('chrome://activity-stream/content/data/content/assets/glyph-minimize-16.svg');
   }
 
   &.icon-maximize {
     background-image: url('chrome://activity-stream/content/data/content/assets/glyph-maximize-16.svg');
--- a/browser/components/newtab/css/activity-stream-linux.css
+++ b/browser/components/newtab/css/activity-stream-linux.css
@@ -341,17 +341,17 @@ body[lwt-newtab-brighttext] {
 }
 .icon.icon-arrowhead-forward-small:dir(rtl) {
   background-image: url("chrome://global/skin/icons/arrow-left-12.svg");
 }
 .icon.icon-arrowhead-up {
   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");
 }
 .icon.icon-maximize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-maximize-16.svg");
 }
 .icon.icon-arrow {
--- a/browser/components/newtab/css/activity-stream-mac.css
+++ b/browser/components/newtab/css/activity-stream-mac.css
@@ -345,17 +345,17 @@ body[lwt-newtab-brighttext] {
 }
 .icon.icon-arrowhead-forward-small:dir(rtl) {
   background-image: url("chrome://global/skin/icons/arrow-left-12.svg");
 }
 .icon.icon-arrowhead-up {
   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");
 }
 .icon.icon-maximize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-maximize-16.svg");
 }
 .icon.icon-arrow {
--- a/browser/components/newtab/css/activity-stream-windows.css
+++ b/browser/components/newtab/css/activity-stream-windows.css
@@ -341,17 +341,17 @@ body[lwt-newtab-brighttext] {
 }
 .icon.icon-arrowhead-forward-small:dir(rtl) {
   background-image: url("chrome://global/skin/icons/arrow-left-12.svg");
 }
 .icon.icon-arrowhead-up {
   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");
 }
 .icon.icon-maximize {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-maximize-16.svg");
 }
 .icon.icon-arrow {
deleted file mode 100644
--- a/browser/components/newtab/data/content/assets/glyph-add-16.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 9.75 8 14a.625.625 0 0 0 1.25 0l0-4.25.5-.5 4.25 0A.625.625 0 0 0 14 8L9.75 8l-.5-.5 0-4.25a.625.625 0 0 0-1.25 0L8 7.5l-.5.5-4.25 0a.625.625 0 0 0 0 1.25l4.137 0 .613.5z"/>
-</svg>
--- a/browser/components/touchbar/MacTouchBar.js
+++ b/browser/components/touchbar/MacTouchBar.js
@@ -115,17 +115,17 @@ var gBuiltInInputs = {
   Find: {
     title: "find",
     image: "chrome://global/skin/icons/search-glass.svg",
     type: kInputTypes.BUTTON,
     callback: () => execCommand("cmd_find"),
   },
   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"),
   },
   Sidebar: {
     title: "open-sidebar",
     image: "chrome://browser/skin/sidebars.svg",
     type: kInputTypes.BUTTON,
     callback: () => {
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -113,16 +113,12 @@ chrome/toolkit/skin/classic/mozapps/exte
 chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg
 chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.svg
 browser/chrome/browser/skin/classic/browser/customize.svg
 
 # Bug 1718144 - De-duplicate lightbulb icon
 browser/features/webcompat-reporter@mozilla.org/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/modules/translation/cld-worker.js.mem
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -254,17 +254,17 @@ moz-input-box > menupopup .context-menu-
   fill: currentColor;
   fill-opacity: 0.8;
   border: none;
   padding: 0 9px;
   margin: 0;
   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 {
   background-color: var(--arrowpanel-dimmed);
 }
 
 #editBMPanel_newFolderButton:hover:active {
   background-color: var(--arrowpanel-dimmed-further);
deleted file mode 100644
--- a/browser/themes/shared/icons/zoom-in.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 9.75 8 14a.625.625 0 0 0 1.25 0l0-4.25.5-.5 4.25 0A.625.625 0 0 0 14 8L9.75 8l-.5-.5 0-4.25a.625.625 0 0 0-1.25 0L8 7.5l-.5.5-4.25 0a.625.625 0 0 0 0 1.25l4.137 0 .613.5z"/>
-</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -180,17 +180,16 @@
 #endif
   skin/classic/browser/stop-to-reload.svg             (../shared/icons/stop-to-reload.svg)
   skin/classic/browser/subtract-circle-fill.svg       (../shared/icons/subtract-circle-fill.svg)
   skin/classic/browser/success-animation.svg          (../shared/icons/success-animation.svg)
   skin/classic/browser/sync.svg                       (../shared/icons/sync.svg)
   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)
 
 
   skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
   skin/classic/browser/search-engine-placeholder@2x.png        (../shared/search/search-engine-placeholder@2x.png)
   skin/classic/browser/search-indicator-badge-add.svg          (../shared/search/search-indicator-badge-add.svg)
 
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -685,17 +685,17 @@
   fill: var(--toolbarbutton-icon-fill);
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 /* New tab button */
 
 #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 */
 
 #alltabs-button {
   list-style-image: url(chrome://global/skin/icons/arrow-down.svg);
 }
 
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -330,17 +330,17 @@ toolbar[brighttext]:-moz-lwtheme {
   list-style-image: url("chrome://browser/skin/edit-paste.svg");
 }
 
 #zoom-out-button {
   list-style-image: url("chrome://browser/skin/zoom-out.svg");
 }
 
 #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 {
   /* This padding is used to center the icon */
   padding-inline-start: 7px;
 }
 
 #PlacesChevron,
--- a/toolkit/components/aboutconfig/content/aboutconfig.css
+++ b/toolkit/components/aboutconfig/content/aboutconfig.css
@@ -223,17 +223,17 @@ td.cell-value > form > input[type="numbe
   background-repeat: no-repeat;
   background-size: 16px;
   fill: currentColor;
   min-width: auto;
   width: 32px;
 }
 
 .button-add {
-  background-image: url("chrome://global/skin/icons/add.svg");
+  background-image: url("chrome://global/skin/icons/plus.svg");
 }
 
 .button-save {
   background-image: url("chrome://global/skin/icons/check.svg");
 }
 
 .button-edit {
   background-image: url("chrome://global/skin/icons/edit.svg");
rename from toolkit/themes/shared/icons/add.svg
rename to toolkit/themes/shared/icons/plus.svg
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -25,17 +25,16 @@ toolkit.jar:
 * skin/classic/global/arrowscrollbox.css                   (../../shared/arrowscrollbox.css)
   skin/classic/global/close-icon.css                       (../../shared/close-icon.css)
   skin/classic/global/datetimeinputpickers.css             (../../shared/datetimeinputpickers.css)
   skin/classic/global/findbar.css                          (../../shared/findbar.css) 
   skin/classic/global/notification.css                     (../../shared/notification.css)
   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)
   skin/classic/global/icons/autoscroll-horizontal.svg      (../../shared/icons/autoscroll-horizontal.svg)
   skin/classic/global/icons/autoscroll-vertical.svg        (../../shared/icons/autoscroll-vertical.svg)
   skin/classic/global/icons/blocked.svg                    (../../shared/icons/blocked.svg)
   skin/classic/global/icons/check.svg                      (../../shared/icons/check.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
@@ -58,16 +57,17 @@ toolkit.jar:
   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/open-in-new.svg                (../../shared/icons/open-in-new.svg)
   skin/classic/global/icons/page-portrait.svg              (../../shared/icons/page-portrait.svg)
   skin/classic/global/icons/page-landscape.svg             (../../shared/icons/page-landscape.svg)
   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)
   skin/classic/global/icons/radio.svg                      (../../shared/icons/radio.svg)
   skin/classic/global/icons/resizer.svg                    (../../shared/icons/resizer.svg)
   skin/classic/global/icons/search-glass.svg               (../../shared/icons/search-glass.svg)
   skin/classic/global/icons/security.svg                   (../../shared/icons/security.svg)
   skin/classic/global/icons/security-broken.svg            (../../shared/icons/security-broken.svg)