Bug 1632878 - Use the photon junk icon in the notification bar and thread pane. r=aleca DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Mon, 27 Apr 2020 13:44:57 +0300
changeset 38941 1d045109e1a34568bcd801710e4c188304743749
parent 38940 c3362d9875b8794b78fbb135af391f487d4be1ab
child 38942 8f494764f4401dd65f09711c5592d00b2b3bab78
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersaleca
bugs1632878
Bug 1632878 - Use the photon junk icon in the notification bar and thread pane. r=aleca DONTBUILD
mail/base/content/mailWindowOverlay.js
mail/themes/linux/jar.mn
mail/themes/linux/mail/icons/junk.png
mail/themes/linux/mail/messageIcons.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/icons/junk.png
mail/themes/osx/mail/messageIcons.css
mail/themes/shared/mail/icons/junk-col.svg
mail/themes/shared/mail/icons/junk.svg
mail/themes/windows/jar.mn
mail/themes/windows/mail/icons/junk.png
mail/themes/windows/mail/messageIcons.css
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -3180,17 +3180,17 @@ var gMessageNotificationBar = {
         },
       },
     ];
 
     if (!this.isShowingJunkNotification()) {
       this.msgNotificationBar.appendNotification(
         junkBarMsg,
         "junkContent",
-        "chrome://messenger/skin/icons/junk.png",
+        "chrome://messenger/skin/icons/junk.svg",
         this.msgNotificationBar.PRIORITY_WARNING_HIGH,
         buttons
       );
     }
   },
 
   isShowingJunkNotification() {
     return !!this.msgNotificationBar.getNotificationWithValue("junkContent");
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -122,17 +122,16 @@ classic.jar:
   skin/classic/messenger/icons/thread-ignored.png             (mail/icons/thread-ignored.png)
   skin/classic/messenger/icons/message-ignored.png            (mail/icons/message-ignored.png)
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/search-arrow.png               (mail/icons/search-arrow.png)
   skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
-  skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
   skin/classic/messenger/icons/dropmarker.svg                 (mail/icons/dropmarker.svg)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
   skin/classic/messenger/icons/status@2x.png                  (mail/icons/status@2x.png)
deleted file mode 100644
index 6ae803d3513383b85139e70457d238d391b11b87..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/linux/mail/messageIcons.css
+++ b/mail/themes/linux/mail/messageIcons.css
@@ -111,27 +111,36 @@ treechildren::-moz-tree-image(flaggedCol
 /* ..... junkStatus column ..... */
 
 .junkStatusHeader {
   list-style-image: url(chrome://messenger/skin/icons/junk-col.svg);
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
-  list-style-image: url(chrome://messenger/skin/icons/message-list.png);
-  -moz-image-region: rect(48px 16px 64px 0);
-  padding-inline-start: 0;
+  list-style-image: url(chrome://messenger/skin/icons/junk.svg);
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, junk) {
-  -moz-image-region: rect(32px 16px 48px 0);
+  fill: #f68a16;
+  fill-opacity: 1;
+  stroke: #eed003;
+  stroke-opacity: 0.8;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
-  -moz-image-region: rect(48px 16px 64px 0);
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
 }
 
 /* ..... subject column ..... */
 
 #subjectCol {
   padding-inline-start: 16px;
 }
 
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -152,17 +152,16 @@ classic.jar:
   skin/classic/messenger/icons/empty-search-results.png          (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/status.png                        (mail/icons/status.png)
   skin/classic/messenger/icons/status@2x.png                     (mail/icons/status@2x.png)
   skin/classic/messenger/icons/status-small.png                  (mail/icons/status-small.png)
   skin/classic/messenger/icons/status-small@2x.png               (mail/icons/status-small@2x.png)
   skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
   skin/classic/messenger/icons/notloading.png                    (mail/icons/notloading.png)
   skin/classic/messenger/icons/notloading@2x.png                 (mail/icons/notloading@2x.png)
-  skin/classic/messenger/icons/junk.png                          (mail/icons/junk.png)
   skin/classic/messenger/icons/phishing.png                      (mail/icons/phishing.png)
   skin/classic/messenger/accountcentral/accountsettings.png      (mail/accountcentral/accountsettings.png)
   skin/classic/messenger/accountcentral/accountsettings@2x.png   (mail/accountcentral/accountsettings@2x.png)
   skin/classic/messenger/accountcentral/folder.png               (mail/accountcentral/folder.png)
   skin/classic/messenger/accountcentral/folder@2x.png            (mail/accountcentral/folder@2x.png)
   skin/classic/messenger/accountcentral/junk.png                 (mail/accountcentral/junk.png)
   skin/classic/messenger/accountcentral/junk@2x.png              (mail/accountcentral/junk@2x.png)
   skin/classic/messenger/accountcentral/mailbox.png              (mail/accountcentral/mailbox.png)
deleted file mode 100644
index d76f96cd9530150204feb8b0a60310cc77e57eff..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/messageIcons.css
+++ b/mail/themes/osx/mail/messageIcons.css
@@ -135,27 +135,37 @@ treechildren::-moz-tree-image(flaggedCol
 .junkStatusHeader {
   list-style-image: url(chrome://messenger/skin/icons/junk-col.svg);
   padding-inline-start: 3px;
   padding-inline-end: 5px !important;
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
-  list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
-  -moz-image-region: rect(0 96px 16px 80px);
   margin-inline-start: 1px;
+  list-style-image: url(chrome://messenger/skin/icons/junk.svg);
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
+}
+
+treechildren::-moz-tree-image(junkStatusCol, junk) {
+  fill: #f68a16;
+  fill-opacity: 1;
+  stroke: #eed003;
+  stroke-opacity: 0.8;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
-  -moz-image-region: rect(0 96px 16px 80px);
-}
-
-treechildren::-moz-tree-image(junkStatusCol, junk) {
-  -moz-image-region: rect(16px 96px 32px 80px);
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
 }
 
 /* ..... correspondent column ..... */
 
 #correspondentCol {
   padding-inline-start: 20px;
 }
 
--- a/mail/themes/shared/mail/icons/junk-col.svg
+++ b/mail/themes/shared/mail/icons/junk-col.svg
@@ -1,7 +1,7 @@
 <!-- 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" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
-    <path d="M7.35 1.12c-2.7 1.45-4.2 3.33-4.26 6.08l-.03.74a4.03 4.03 0 0 0 3.95 4.04 4 4 0 0 0 3.93-4.04l.02-1c0-1.57-1.22-2.93-2.14-3.58.66 1.54.64 2.77-.63 3.8l-.4.26-.44-.24c-1.55-2.01-1-4.04 0-6.06z"/>
+    <path d="M6.67 1.12c2.7 1.45 4.2 3.33 4.26 6.08v.74a4.03 4.03 0 01-3.92 4.04 4 4 0 01-3.93-4.04l-.02-1c0-1.57 1.22-2.93 2.14-3.58-.66 1.54-.64 2.77.63 3.8l.4.26.44-.24c1.55-2.01 1-4.04 0-6.06z"/>
 </svg>
--- a/mail/themes/shared/mail/icons/junk.svg
+++ b/mail/themes/shared/mail/icons/junk.svg
@@ -1,7 +1,7 @@
 <!-- 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 width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M13.943 11.73c-.49 2.59-2.828 4.27-5.56 4.27-2.375 0-4.396-1.47-5.121-3.726-.307-.953-.348-2.278-.212-3.788.05-.546.073-1.104.2-1.524.16-.535.785-.95 1.135-.95s1.366.337 2.076.955c.342-1.256.102-2.85-.715-3.928a1.27 1.27 0 0 1 1.48-1.95c4.393 1.728 7.464 6.705 6.717 10.641zM7.566 9.222l-.817 1.098-.798-1.112c-.045-.063-.411-.4-.883-.803-.01.086-.018.174-.026.261-.114 1.262-.08 2.364.124 2.996C5.624 13.09 6.876 14 8.383 14c1.823 0 3.296-1.058 3.595-2.642.454-2.39-1.108-5.514-3.598-7.353.479 1.81.219 3.829-.814 5.217z"/>
-  <path d="M8.36 12.87c.61 0 1.105-.493 1.124-1.131.007-.231-.035-.737-.101-1.224-.242.458-.536.786-.93.948l-.242.097c-.016.007-.842.333-1.022.409l-.04.017c.243.46.79.884 1.21.884zm-2.312-1.028c-.046-.264.055-.4.216-.524.048-.036.1-.068.165-.102.091-.048.212-.102.375-.17.19-.08 1.027-.41 1.035-.414l.234-.095c.17-.07.359-.316.53-.708.084-.192.146-.368.239-.66.052-.163.063-.197.085-.255a.939.939 0 0 1 .06-.135c.095-.169.2-.279.46-.279.751 0 1.074 2.002 1.037 3.268-.035 1.174-.968 2.102-2.125 2.102-1.02 0-2.127-1.004-2.31-2.028z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-stroke" fill-opacity="context-stroke-opacity" d="M8.25 3.84c2.48 1.42 4.64 6.11 3.7 8.05-1.16 2.02-2.75 2.44-5.07 1.92-1.76-1.1-2.3-3.48-1.87-5.54.73.3 1.47.88 1.97 1.56 1.9-1.53 1.76-4.01 1.27-6z"/>
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13.94 11.73C13.45 14.32 11.12 16 8.38 16a4.9 4.9 0 01-4.93-3.5c-.62-1.8-.46-4.35-.2-5.54.6-1.72 2.38-.7 3.21 0 .34-1.25.1-2.84-.71-3.92C4.96 2 6.03.6 7.23 1.09c4.39 1.73 7.46 6.7 6.71 10.64zM7 10S6 8.55 5.07 8.4c0 0-.33 2.2.3 3.6s1.5 2 3.01 2c1.83 0 3.3-1.06 3.6-2.64.45-2.4-1.11-5.52-3.6-7.35C8.86 5.8 8.76 8.34 7 10z"/>
 </svg>
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -112,17 +112,16 @@ classic.jar:
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flag-empty.png                 (mail/icons/flag-empty.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/read.png                       (mail/icons/read.png)
   skin/classic/messenger/icons/unreadmail.png                 (mail/icons/unreadmail.png)
   skin/classic/messenger/icons/search-arrow.gif               (mail/icons/search-arrow.gif)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
-  skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
deleted file mode 100755
index 4fbd66128ca5889ce9e5940a85e26ee8b5505c76..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/messageIcons.css
+++ b/mail/themes/windows/mail/messageIcons.css
@@ -98,37 +98,44 @@ treechildren::-moz-tree-image(flaggedCol
 }
 
 treechildren::-moz-tree-image(flaggedCol, flagged) {
   list-style-image: url(chrome://messenger/skin/icons/flag-col.png);
 }
 
 /* ..... junkStatus column ..... */
 
-treechildren::-moz-tree-image(junkStatusCol) {
-  margin-inline-start: -3px;
-  list-style-image: url(chrome://messenger/skin/icons/folder.png);
-}
-
 .junkStatusHeader {
   list-style-image: url(chrome://messenger/skin/icons/junk-col.svg);
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
-  -moz-image-region: rect(16px 128px 32px 112px);
+  margin-inline-start: -3px;
   padding-inline-start: 0;
+  list-style-image: url(chrome://messenger/skin/icons/junk.svg);
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, junk) {
-  -moz-image-region: rect(0 128px 16px 112px);
+  fill: #f68a16;
+  fill-opacity: 1;
+  stroke: #eed003;
+  stroke-opacity: 0.8;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
-  -moz-image-region: rect(16px 128px 32px 112px);
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0.2;
+  stroke-opacity: 0;
 }
 
 /* ..... subject column ..... */
 
 treechildren::-moz-tree-image(subjectCol) {
   list-style-image: url(chrome://messenger/skin/icons/message.png);
 }