Bug 1521416 - Fix the thread pane icon with dark theme enabled. r=arshad
authorRichard Marti <richard.marti@gmail.com>
Sun, 20 Jan 2019 21:08:44 +0100
changeset 34265 ab66eaf0f57523abdc3457e0be73fc9d8734d255
parent 34264 9945bbe9adafb5da58aba587844c83359d8374bd
child 34266 9f1580781aa3eaefdfcfd5ddfa919f4aa69440a7
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersarshad
bugs1521416
Bug 1521416 - Fix the thread pane icon with dark theme enabled. r=arshad
mail/themes/osx/jar.mn
mail/themes/osx/mail/icons/dot.svg
mail/themes/osx/mail/messageIcons.css
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -140,16 +140,17 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignNotOk.png            (mail/smime/hdrSignNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png             (mail/smime/hdrCryptoOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png          (mail/smime/hdrCryptoNotOk.png)
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
   skin/classic/messenger/icons/attachment-deleted.png            (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png      (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
+  skin/classic/messenger/icons/dot.svg                           (mail/icons/dot.svg)
   skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
   skin/classic/messenger/icons/folder-pane.png                   (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-pane@2x.png                (mail/icons/folder-pane@2x.png)
   skin/classic/messenger/icons/exclude.png                       (mail/icons/exclude.png)
   skin/classic/messenger/icons/exclude-selected.png              (mail/icons/exclude-selected.png)
   skin/classic/messenger/icons/group-background.gif              (mail/icons/group-background.gif)
   skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
new file mode 100644
--- /dev/null
+++ b/mail/themes/osx/mail/icons/dot.svg
@@ -0,0 +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" fill-opacity="0.8">
+    <circle cx="6" cy="6" r="2"/>
+</svg>
--- a/mail/themes/osx/mail/messageIcons.css
+++ b/mail/themes/osx/mail/messageIcons.css
@@ -4,53 +4,38 @@
 
 /* ..... thread column ..... */
 
 .threadColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
-  list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(threadCol, container, focus, selected) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-treechildren::-moz-tree-image(threadCol, container, hasUnread) {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-treechildren::-moz-tree-image(threadCol, container, hasUnread, focus, selected) {
-  -moz-image-region: rect(16px 32px 32px 16px);
+  list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
 }
 
 /* ..... read column ..... */
 
 .readColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/readcol.svg);
   padding-inline-start: 2px;
   padding-inline-end: 3px;
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader) {
-  list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-:root[lwt-tree-brighttext] treechildren::-moz-tree-image(unreadButtonColHeader),
-treechildren::-moz-tree-image(unreadButtonColHeader, focus, selected) {
-  -moz-image-region: rect(16px 48px 32px 32px);
+  list-style-image: url(chrome://messenger/skin/icons/dot.svg);
+  -moz-image-region: auto;
+  width: 13px;
+  height: 13px;
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
   list-style-image: url(chrome://messenger/skin/icons/unreadmail.png) !important;
-  -moz-image-region: auto !important;
+  width: 16px;
+  height: 16px;
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader, unread, selected, focus) {
   list-style-image: url(chrome://messenger/skin/icons/unreadmail-selected.png) !important;
 }
 
 treechildren::-moz-tree-image(subjectCol, replied) {
   list-style-image: url(chrome://messenger/skin/icons/symbol-replied.png) !important;
@@ -92,26 +77,22 @@ treechildren::-moz-tree-image(attachment
 
 .flagColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/flag-col.svg);
   padding-right: 3px;
   padding-left: 3px;
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
-  list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-:root[lwt-tree-brighttext] treechildren::-moz-tree-image(flaggedCol),
-treechildren::-moz-tree-image(flaggedCol, focus, selected) {
-  -moz-image-region: rect(16px 48px 32px 32px);
+  list-style-image: url(chrome://messenger/skin/icons/dot.svg);
+  -moz-image-region: auto;
 }
 
 treechildren::-moz-tree-image(flaggedCol, flagged) {
+  list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
 treechildren::-moz-tree-image(flaggedCol, flagged, focus, selected) {
   -moz-image-region: rect(16px 80px 32px 64px);
 }
 
 /* ..... junkStatus column ..... */
@@ -211,52 +192,18 @@ treechildren::-moz-tree-image(threadCol,
 }
 
 treechildren::-moz-tree-image(threadCol, ignoreSubthread) {
   list-style-image: url(chrome://messenger/skin/icons/message-closed-kill.png) !important;
   -moz-image-region: auto !important;
 }
 
 @media (min-resolution: 2dppx) {
-  treechildren::-moz-tree-image(threadCol, container) {
+  treechildren::-moz-tree-image(flaggedCol, flagged) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  treechildren::-moz-tree-image(threadCol, container, focus, selected) {
-    -moz-image-region: rect(32px 32px 64px 0);
-  }
-
-  treechildren::-moz-tree-image(threadCol, container, hasUnread) {
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
-  treechildren::-moz-tree-image(threadCol, container, hasUnread, focus, selected) {
-    -moz-image-region: rect(32px 64px 64px 32px);
-  }
-
-  treechildren::-moz-tree-image(unreadButtonColHeader) {
-    list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  treechildren::-moz-tree-image(unreadButtonColHeader, focus, selected) {
-    -moz-image-region: rect(32px 96px 64px 64px);
-  }
-
-  treechildren::-moz-tree-image(flaggedCol) {
-    list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  treechildren::-moz-tree-image(flaggedCol, focus, selected) {
-    -moz-image-region: rect(32px 96px 64px 64px);
-  }
-
-  treechildren::-moz-tree-image(flaggedCol, flagged) {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 
   treechildren::-moz-tree-image(flaggedCol, flagged, focus, selected) {
     -moz-image-region: rect(32px 160px 64px 128px);
   }
 
   treechildren::-moz-tree-image(junkStatusCol) {
@@ -267,19 +214,17 @@ treechildren::-moz-tree-image(threadCol,
   treechildren::-moz-tree-image(junkStatusCol, notjunk) {
     -moz-image-region: rect(0 192px 32px 160px);
   }
 
   treechildren::-moz-tree-image(junkStatusCol, junk) {
     -moz-image-region: rect(32px 192px 64px 160px);
   }
 
-  treechildren::-moz-tree-image(threadCol, container),
-  treechildren::-moz-tree-image(unreadButtonColHeader),
-  treechildren::-moz-tree-image(flaggedCol),
+  treechildren::-moz-tree-image(flaggedCol, flagged),
   treechildren::-moz-tree-image(junkStatusCol),
   treechildren::-moz-tree-image(correspondentCol) {
     width: 16px;
     height: 16px;
   }
 
   treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
     width: 13px;