diff --git a/mail/base/jar.mn b/mail/base/jar.mn index b9ae19a94a06..b0adc39ff434 100644 --- a/mail/base/jar.mn +++ b/mail/base/jar.mn @@ -75,8 +75,11 @@ classic.jar: skin/classic/messenger/icons/message-mail-imapdelete.png (skin/icons/message-mail-imapdelete.png) skin/classic/messenger/icons/message-mail-new.png (skin/icons/message-mail-new.png) skin/classic/messenger/icons/message-mail-read.png (skin/icons/message-mail-read.png) - skin/classic/messenger/icons/message-news.png (skin/icons/message-news.png) - skin/classic/messenger/icons/attachment-col.png (skin/icons/attachment-col.png) + skin/classic/messenger/icons/message-news.png (skin/icons/message-news.png) + skin/classic/messenger/icons/message-news-forwarded.png (skin/icons/message-news-forwarded.png) + skin/classic/messenger/icons/message-news-replied.png (skin/icons/message-news-replied.png) + skin/classic/messenger/icons/message-news-replied-forw.png (skin/icons/message-news-replied-forw.png) + skin/classic/messenger/icons/attachment-col.png (skin/icons/attachment-col.png) skin/classic/messenger/icons/attachment.png (skin/icons/attachment.png) skin/classic/messenger/icons/junk-col.png (skin/icons/junk-col.png) skin/classic/messenger/icons/thread-col.png (skin/icons/thread-col.png) diff --git a/mail/base/skin/mailWindow1.css b/mail/base/skin/mailWindow1.css index fbfb902f7d9b..effd7dbf5bd1 100644 --- a/mail/base/skin/mailWindow1.css +++ b/mail/base/skin/mailWindow1.css @@ -348,74 +348,52 @@ treechildren::-moz-tree-image(subjectCol, replied) { } - - treechildren::-moz-tree-image(subjectCol, replied, read) { - list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-read.png"); - } - - treechildren::-moz-tree-image(subjectCol, replied, forwarded) { - list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw.png"); - } - - treechildren::-moz-tree-image(subjectCol, replied, forwarded,read) { - list-style-image: url("chrome://messenger/skin/icons/message-mail-replied-forw-read.png"); - } - /* IMPORTANT: make sure the imap-deleted column always comes after the replied/forwarded style rules. - This ensures that we show that the message is marked as deleted over status information. */ - - treechildren::-moz-tree-image(subjectCol, imapdeleted) { - list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png"); - } - - /* IMPORTANT: make sure our style rules for news articles always come after the message replied/forward style rules. - This ensures that we show news post artwork even when the article is replied to. We could probably also fix this - by adding more qualifiers to our CSS */ - - treechildren::-moz-tree-image(subjectCol, news) { - list-style-image: url("chrome://messenger/skin/icons/message-news.png"); - } - - +treechildren::-moz-tree-image(subjectCol, news, forwarded) { + list-style-image: url("chrome://messenger/skin/icons/message-news-forwarded.png"); +} + +treechildren::-moz-tree-image(subjectCol, news, replied) { + list-style-image: url("chrome://messenger/skin/icons/message-news-replied.png"); +} + +treechildren::-moz-tree-image(subjectCol, news, replied, forwarded) { + list-style-image: url("chrome://messenger/skin/icons/message-news-replied-forw.png"); +} + treechildren::-moz-tree-image(subjectCol, news, attach, offline) { - list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif"); - } - - treechildren::-moz-tree-image(subjectCol, news, new) { - list-style-image: url("chrome://messenger/skin/icons/message-news-new.png"); - } diff --git a/mail/base/skin/searchDialog.css b/mail/base/skin/searchDialog.css index 6cd0f769dd5a..09ed79955cd4 100644 --- a/mail/base/skin/searchDialog.css +++ b/mail/base/skin/searchDialog.css @@ -191,6 +191,18 @@ treechildren::-moz-tree-image(subjectCol, news) { list-style-image: url("chrome://messenger/skin/icons/message-news.png"); } +treechildren::-moz-tree-image(subjectCol, news, forwarded) { + list-style-image: url("chrome://messenger/skin/icons/message-news-forwarded.png"); +} + +treechildren::-moz-tree-image(subjectCol, news, replied) { + list-style-image: url("chrome://messenger/skin/icons/message-news-replied.png"); +} + +treechildren::-moz-tree-image(subjectCol, news, replied, forwarded) { + list-style-image: url("chrome://messenger/skin/icons/message-news-replied-forw.png"); +} + treechildren::-moz-tree-image(subjectCol, news, attach, offline) { list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.gif"); }