X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fmessenger%2FthreadPane.css;h=8f131a414a03a42909c6440b2613240528559a21;hp=bf3e58f099dcd135ef51bb5ea451420007d6f274;hb=afa44bf62eca2c695eec140b1a0e0028bffac2f6;hpb=a1f525f0c2c8526761b87b460de74e463e4f263f

diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index bf3e58f0..8f131a41 100644
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -1,41 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Scott MacGregor (mscott@netscape.com)
- *   Joe Hewitt (hewitt@netscape.com)
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -53,8 +18,12 @@ treechildren::-moz-tree-cell-text(unread) {
   font-weight: bold;
 }
 
+treechildren::-moz-tree-cell-text(imapdeleted) {
+  text-decoration: line-through;
+}
+
 /* on a collapsed thread, if the top level message is read, but the thread has
- * unread children, underline the text.  4.x mac did this, very slick 
+ * unread children, underline the text.  4.x mac did this, very slick
  */
 treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
   text-decoration: underline;
@@ -96,16 +65,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) {
@@ -142,70 +111,117 @@ 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 {
+  /* the message icons are only 14px high */
+  height: 14px;
+  margin-bottom: 2px;
+}
 
+.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) {
+  margin-inline-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) {
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-forward.gif");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-reply.gif");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-forward-reply.gif");
+}
+
+.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");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-forward.gif");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-reply.gif");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-forward-reply.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");
 }
@@ -214,35 +230,86 @@ 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) {
+treechildren::-moz-tree-image(subjectCol, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-forward-offline.gif");
+}
+
+treechildren::-moz-tree-image(subjectCol, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offline-reply.gif");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-forward-offline-reply.gif");
+}
+
+.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");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-forward-offline.gif");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offline-reply.gif");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-forward-offline-reply.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) {
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.gif");
+}
+
+.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) {
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.gif");
+}
+
+.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");
 }
 
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-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");
 }
 
@@ -250,10 +317,18 @@ 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");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offline.gif");
+}
+
 /* ..... new thread icons for watch and ignore ..... */
 
 treechildren::-moz-tree-image(news, threadCol, watch) {