Bug 1705788, combine duplicated stop/close icons, r=desktop-theme-reviewers,harry
authorNeil Deakin <neil@mozilla.com>
Tue, 27 Apr 2021 12:34:34 +0000
changeset 577626 d24f1b87c1e6c1caa8bc5ce9c5c697d29ae11f79
parent 577625 1659fc495cb441a8e2b37ff835842797149f2a5f
child 577627 eb9d5a5e536db27799161a7883a925a979411d3a
push id38412
push userabutkovits@mozilla.com
push dateTue, 27 Apr 2021 22:18:30 +0000
treeherdermozilla-central@3009bdef939c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdesktop-theme-reviewers, harry
bugs1705788
milestone90.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 1705788, combine duplicated stop/close icons, r=desktop-theme-reviewers,harry Differential Revision: https://phabricator.services.mozilla.com/D113366
browser/components/protections/content/protections.css
browser/installer/allowed-dupes.mn
browser/themes/shared/browser.inc.css
browser/themes/shared/contextmenu.inc.css
browser/themes/shared/icons/stop.svg
browser/themes/shared/jar.inc.mn
browser/themes/shared/places/editBookmarkPanel.inc.css
browser/themes/shared/toolbarbutton-icons.inc.css
--- a/browser/components/protections/content/protections.css
+++ b/browser/components/protections/content/protections.css
@@ -260,17 +260,17 @@ a.hidden,
 }
 
 .exit-icon {
   position: absolute;
   width: var(--exit-icon-size);
   height: var(--exit-icon-size);
   top: var(--exit-icon-position);
   inset-inline-end: var(--exit-icon-position);
-  background-image: url(chrome://browser/skin/stop.svg);
+  background-image: url(chrome://global/skin/icons/close.svg);
   background-size: calc(var(--exit-icon-size) - 2px);
   background-color: transparent;
   background-position: center;
   background-repeat: no-repeat;
   -moz-context-properties: fill;
   fill: var(--in-content-deemphasized-text);
 
   /* Override margin, padding, min-height and min-width set in common.inc.css */
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -104,20 +104,16 @@ chrome/toolkit/skin/classic/global/icons
 chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
 chrome/toolkit/skin/classic/global/icons/arrow-up-16.svg
 chrome/toolkit/skin/classic/global/icons/find-previous-arrow.svg
 
 # Bug 1704669 - Deduplicate checkmark icons in the tree
 chrome/toolkit/skin/classic/global/icons/success.svg
 chrome/toolkit/skin/classic/global/icons/check.svg
 
-# Bug 1699631 - De-duplicate the stop/close icons
-browser/chrome/browser/skin/classic/browser/stop.svg
-chrome/toolkit/skin/classic/global/icons/close.svg
-
 # Bug 1706206 - De-duplicate storage icons
 browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
 browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
 
 # Bug 1707690 - De-duplicate folder icons
 browser/chrome/browser/skin/classic/browser/places/folder.svg
 chrome/toolkit/skin/classic/global/icons/folder.svg
 
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -503,17 +503,17 @@ menupopup::part(drop-indicator) {
 #contextual-feature-recommendation-notification[data-notification-bucket="CFR_MILESTONE_MESSAGE"] .popup-notification-button.popup-notification-primary-button:active {
   background-color: rgba(216, 216, 216, 0.5);
 }
 
 #contextual-feature-recommendation-notification[data-notification-bucket="CFR_MILESTONE_MESSAGE"] .popup-notification-button.popup-notification-secondary-button {
   margin: 3px;
   border: none;
   border-radius: 2px;
-  background-image: url(chrome://browser/skin/stop.svg);
+  background-image: url(chrome://global/skin/icons/close.svg);
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: center;
   background-size: 10px;
   -moz-context-properties: fill;
   fill: white;
   height: 22px;
   width: 22px;
--- a/browser/themes/shared/contextmenu.inc.css
+++ b/browser/themes/shared/contextmenu.inc.css
@@ -28,17 +28,17 @@
   list-style-image: url("chrome://browser/skin/forward.svg");
 }
 
 #context-reload {
   list-style-image: url("chrome://browser/skin/reload.svg");
 }
 
 #context-stop {
-  list-style-image: url("chrome://browser/skin/stop.svg");
+  list-style-image: url("chrome://global/skin/icons/close.svg");
 }
 
 #context-bookmarkpage {
   list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
 }
 
 #context-bookmarkpage[starred=true] {
   list-style-image: url("chrome://browser/skin/bookmark.svg");
deleted file mode 100644
--- a/browser/themes/shared/icons/stop.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="m9.108 7.776 4.709-4.709a.626.626 0 0 0-.884-.885L8.244 6.871l-.488 0-4.689-4.688a.625.625 0 1 0-.884.885L6.87 7.754l0 .491-4.687 4.687a.626.626 0 0 0 .884.885L7.754 9.13l.491 0 4.687 4.687a.627.627 0 0 0 .885 0 .626.626 0 0 0 0-.885L9.108 8.223l0-.447z"/>
-</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -193,17 +193,16 @@
   skin/classic/browser/screenshot.svg                 (../shared/icons/screenshot.svg)
   skin/classic/browser/send-to-device.svg             (../shared/icons/send-to-device.svg)
   skin/classic/browser/sidebars.svg                   (../shared/icons/sidebars.svg)
   skin/classic/browser/sidebars-right.svg             (../shared/icons/sidebars-right.svg)
   skin/classic/browser/sign-out.svg                   (../shared/icons/sign-out.svg)
 #ifndef MOZ_WIDGET_GTK
   skin/classic/browser/sort.svg                       (../shared/icons/sort.svg)
 #endif
-  skin/classic/browser/stop.svg                       (../shared/icons/stop.svg)
   skin/classic/browser/stop-to-reload.svg             (../shared/icons/stop-to-reload.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/tab-12.svg                     (../shared/icons/tab-12.svg)
   skin/classic/browser/tip.svg                        (../shared/icons/tip.svg)
   skin/classic/browser/unpin-tab.svg                  (../shared/icons/unpin-tab.svg)
   skin/classic/browser/whatsnew.svg                   (../shared/icons/whatsnew.svg)
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@@ -83,17 +83,17 @@
   padding-top: 2px;
 }
 
 #editBookmarkPanelRecommendation #cfrClose {
   padding: 10px;
   border: none;
   border-radius: var(--toolbarbutton-border-radius);
   background-color: transparent;
-  background-image: url(chrome://browser/skin/stop.svg);
+  background-image: url(chrome://global/skin/icons/close.svg);
   background-size: 12px;
   background-repeat: no-repeat;
   background-position: center;
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 0.8;
   margin-inline-end: -4px;
   color: inherit;
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -158,17 +158,17 @@ toolbar[brighttext] {
   transform: translateX(-300px);
 }
 
 #reload-button {
   list-style-image: url("chrome://browser/skin/reload.svg");
 }
 
 #stop-button {
-  list-style-image: url("chrome://browser/skin/stop.svg");
+  list-style-image: url("chrome://global/skin/icons/close.svg");
 }
 
 #home-button {
   list-style-image: url("chrome://browser/skin/home.svg");
 }
 
 #bookmarks-toolbar-button,
 #bookmarks-toolbar-placeholder {