Bug 1630637 - Port bug 1630615 - Remove duplicate settings icons. r=Paenglab DONTBUILD
authorTim Nguyen <ntim.bugs@gmail.com>
Thu, 16 Apr 2020 16:39:46 +0200
changeset 38864 9b5654e05c5bddb287a095bd12e95f368f492c20
parent 38863 9542da958f7d275af37fc113ad9e57c71fc04c3d
child 38865 5153862b3aba5b3b0eca093c63117bf2cbdfef85
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersPaenglab
bugs1630637, 1630615
Bug 1630637 - Port bug 1630615 - Remove duplicate settings icons. r=Paenglab DONTBUILD Ports https://hg.mozilla.org/integration/autoland/rev/7749765974c1
mail/base/jar.mn
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/mail/accountCentral.css
mail/themes/shared/mail/tabmail.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -1,14 +1,13 @@
 #filter substitution
 
 messenger.jar:
 % content messagebody %content/messagebody/ contentaccessible=yes
 % content messenger %content/messenger/ contentaccessible=yes
-% override chrome://browser/skin/preferences/general.svg chrome://mozapps/skin/extensions/utilities.svg
 % override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
 #ifndef MOZILLA_OFFICIAL
 % override chrome://browser/content/browser-development-helpers.js chrome://messenger/content/browser-development-helpers.js
   content/messenger/browser-development-helpers.js (../../common/src/browser-development-helpers.js)
 #endif
     content/messenger/mailWindow.js                 (content/mailWindow.js)
     content/messenger/messageDisplay.js             (content/messageDisplay.js)
     content/messenger/folderDisplay.js              (content/folderDisplay.js)
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -284,17 +284,17 @@ toolbar[mode="text"] .button-appmenu .to
   list-style-image: url("chrome://messenger/skin/icons/filter.svg");
 }
 
 #appmenu_customize {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
 }
 
 #appmenu_preferences {
-  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 #appmenu-quit {
   list-style-image: url("chrome://messenger/skin/icons/quit.svg");
 }
 
 #appmenu_find {
   list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -310,17 +310,17 @@ toolbar[mode="text"] .button-appmenu .to
   list-style-image: url("chrome://messenger/skin/icons/filter.svg");
 }
 
 #appmenu_customize {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
 }
 
 #appmenu_preferences {
-  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 #appmenu-quit {
   list-style-image: url("chrome://messenger/skin/icons/quit.svg");
 }
 
 #appmenu_addons,
 #appmenu_Add-Ons {
--- a/mail/themes/shared/mail/accountCentral.css
+++ b/mail/themes/shared/mail/accountCentral.css
@@ -448,17 +448,17 @@ aside.settings-btn-container {
   background-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 #developerLink:before {
   background-image: url("chrome://messenger/skin/icons/developer.svg");
 }
 
 #settingsButton:before {
-  background-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  background-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 #readButton:before {
   background-image: url("chrome://messenger/skin/icons/inbox.svg");
 }
 
 #composeButton:before {
   background-image: url("chrome://messenger/skin/icons/newmsg.svg");
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -49,17 +49,17 @@
   -moz-image-region: auto;
 }
 
 .tabmail-tab[type="accountManager"] {
   list-style-image: url("chrome://messenger/skin/icons/sidebar-left.svg");
 }
 
 .tabmail-tab[type="preferencesTab"] {
-  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 .tabmail-tab[type="glodaSearch"] {
   list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
 }
 
 .tab-content {
   padding-inline-end: 9px;
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -258,17 +258,17 @@ toolbar[mode="text"] .button-appmenu .to
   list-style-image: url("chrome://messenger/skin/icons/filter.svg");
 }
 
 #appmenu_customize {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
 }
 
 #appmenu_preferences {
-  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 #appmenu-quit {
   list-style-image: url("chrome://messenger/skin/icons/quit.svg");
 }
 
 #appmenu_addons,
 #appmenu_Add-Ons {