X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fmessenger%2FthreadPane.css;h=903f9ee031ffff8e9e0d5c13a132653d98f31960;hp=14e53ec0007f2b5cebe18cd11f88f40f6acfc6f9;hb=ca77d70df2ba0c0abef5efbc360881f9f9537f76;hpb=61af9d1c3f2699c8e546b10ac50c518b0f830b56

diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index 14e53ec0..903f9ee0 100644
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -100,16 +100,16 @@ treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
-  list-style-image: url("chrome://messenger/skin/icons/unthreadcol.gif");
+.threadColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/column-thread-unthread.gif");
 }
 
-treecol.threadColumnHeader[sortDirection="ascending"]  {
-  list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
+.threadColumnHeader[sortDirection="ascending"]  {
+  list-style-image: url("chrome://messenger/skin/icons/column-thread.gif");
 }
 
-treecol.threadColumnHeader[sortDirection="descending"] {
-  list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
+.threadColumnHeader[sortDirection="descending"] {
+  list-style-image: url("chrome://messenger/skin/icons/column-thread.gif");
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
@@ -146,70 +146,93 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open, offline) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
-  list-style-image: url("chrome://messenger/skin/icons/readcol.gif");
+.readColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/column-read-header.gif");
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader) {
-  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-neutral.gif");
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
-  list-style-image: url("chrome://messenger/skin/icons/unreadmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-read-unread.gif");
+}
+
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-col.gif");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment.gif");
 }
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
-  list-style-image: url("chrome://messenger/skin/icons/flagcol.gif");
+.flagColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/column-flag.gif");
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
-  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-neutral.gif");
 }
 
 treechildren::-moz-tree-image(flaggedCol, flagged) {
-  list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-flag.gif");
 }
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
-  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/column-junk.gif");
 }
 
-/* "unknown" now looks like "not junk".  see bug #182386 */
+/* "unknown" now looks almost like "not junk", but not quite */
 treechildren::-moz-tree-image(junkStatusCol) {
-  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-junk-unknown.gif");
 }
 
 treechildren::-moz-tree-image(junkStatusCol, junk) {
-  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-junk.gif");
 }
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
-  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/column-neutral.gif");
 }
 
-/* ..... subject column ..... */
+/* ..... subject column and tab icons ..... */
 
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -4px;
+  /* the message icons are only 14px high */
+  height: 14px;
+}
+
+.tabmail-tab[type="message"],
 treechildren::-moz-tree-image(subjectCol) {
-  margin-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol) {
+  -moz-margin-end: 2px;
+}
+
 treechildren::-moz-tree-image(subjectCol, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, attach) {
+.tabmail-tab[type="message"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
 }
 
+.tabmail-tab[type="message"][IMAPDeleted="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
 }
 
+.tabmail-tab[type="message"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-offline.gif");
 }
@@ -218,35 +241,47 @@ treechildren::-moz-tree-image(subjectCol, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offline.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, attach, offline) {
+.tabmail-tab[type="message"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offline.gif");
 }
 
+.tabmail-tab[type="message"][IMAPDeleted="true"][Offline="true"],
 treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdel-offline.gif");
 }
 
+.tabmail-tab[type="message"][MessageType="rss"],
+.tabmail-tab[type="message"][MessageType="nntp"],
+treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, news, attach) {
+.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"],
+.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
+.tabmail-tab[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.tabmail-tab[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offline.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, news, new, attach) {
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.gif");
 }
 
-treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-offline.gif");
 }
 
@@ -254,6 +289,9 @@ treechildren::-moz-tree-image(subjectCol, news, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-offline.gif");
 }
 
+.tabmail-tab[type="message"][MessageType="rss"][Offline="true"],
+.tabmail-tab[type="message"][MessageType="nntp"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, rss, offline),
 treechildren::-moz-tree-image(subjectCol, news, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-offline.gif");
 }