update both themes for tabmail patch v14

diff --git a/EarlyBlue/messenger/folderPane.css b/EarlyBlue/messenger/folderPane.css
index f01e98da7ca20cbf9f2c6b1e57cec565f6a39d53..36eb24f8a569c2a4dcad093ddc6ee4373e9a5a12 100644 (file)
--- a/EarlyBlue/messenger/folderPane.css
+++ b/EarlyBlue/messenger/folderPane.css
@@ -48,21 +48,29 @@
 
 treechildren::-moz-tree-image(folderNameCol) {
   -moz-padding-end: 2px;
+}
+
+.tabmail-tab[type="folder"],
+treechildren::-moz-tree-image(folderNameCol) {
   list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
+.tabmail-tab[type="folder"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.gif");
 }
 
 /* ..... News and Feeds ..... */
 
+.tabmail-tab[type="folder"][ServerType="nntp"],
+.tabmail-tab[type="folder"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
+.tabmail-tab[type="folder"][ServerType="nntp"][NewMessages="true"],
+.tabmail-tab[type="folder"][ServerType="rss"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.gif");
@@ -70,70 +78,73 @@ treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
 
 /* ..... Inbox ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
 }
 
+.tabmail-tab[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.gif");
 }
 
 /* ..... Sent ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Sent"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
 }
 
 /* ..... Unsent ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
+.tabmail-tab[type="folder"][SpecialFolder="Unsent Messages"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox),
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
 }
 
 /* ..... Drafts ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
 }
 
 /* ..... Templates ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Templates"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
 /* ..... Junk ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Junk"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
 /* ..... Trash ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Trash"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
 }
 
 /* ..... Saved Searches ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
 }
 
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+.tabmail-tab[type="folder"][NewMessages="true"],
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
   font-weight: bold;
 }
 
+.tabmail-tab[type="folder"][ImapShared="true"],
 treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
   -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-share.gif");
@@ -141,45 +152,47 @@ treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
 
 /* ..... Server Folders ..... */
 
+.tabmail-tab[type="folder"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
+.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
+.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
   list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
 }
@@ -190,6 +203,7 @@ treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
   font-weight: bold;
 }
 
+.tabmail-tab[type="folder"][IsServer="true"],
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
 treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
   font-weight: bold;

diff --git a/EarlyBlue/messenger/mailWindow1.css b/EarlyBlue/messenger/mailWindow1.css
index b4f201181d846c38afc0f5a668ddf4cb00632bf4..85da17f94c11651adaee3bb65f826ae0e374c55f 100644 (file)
--- a/EarlyBlue/messenger/mailWindow1.css
+++ b/EarlyBlue/messenger/mailWindow1.css
@@ -87,3 +87,7 @@ tabpanels {
   /* don't draw tabpanel borders; see also tabbrowser.css */
   -moz-appearance: none;
 }
+
+.tab-close-button {
+  margin: 0;
+}

diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index 75151ff5598e8c9936f07fbabeac9f292b688bb9..755ef4cfde8987c67d4fffd5694edc898a4a8259 100644 (file)
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -201,25 +201,38 @@ treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   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) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
+}
 
 treechildren::-moz-tree-image(subjectCol) {
   -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
 }
 
 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");
 }
@@ -228,24 +241,34 @@ 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");
 }
 
@@ -254,11 +277,11 @@ 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");
 }
 
@@ -266,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");
 }

diff --git a/LCARStrek/messenger/folderPane.css b/LCARStrek/messenger/folderPane.css
index 5679a6c1dc147e583c0181cf54795ec911a8fed0..9b464e8f22e24bb6a313f4b3c92f883c110f01f5 100644 (file)
--- a/LCARStrek/messenger/folderPane.css
+++ b/LCARStrek/messenger/folderPane.css
@@ -48,21 +48,29 @@
 
 treechildren::-moz-tree-image(folderNameCol) {
   -moz-padding-end: 2px;
+}
+
+.tabmail-tab[type="folder"],
+treechildren::-moz-tree-image(folderNameCol) {
   list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
+.tabmail-tab[type="folder"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.gif");
 }
 
 /* ..... News and Feeds ..... */
 
+.tabmail-tab[type="folder"][ServerType="nntp"],
+.tabmail-tab[type="folder"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
+.tabmail-tab[type="folder"][ServerType="nntp"][NewMessages="true"],
+.tabmail-tab[type="folder"][ServerType="rss"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true),
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.gif");
@@ -70,70 +78,73 @@ treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
 
 /* ..... Inbox ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
 }
 
+.tabmail-tab[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.gif");
 }
 
 /* ..... Sent ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Sent"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
 }
 
 /* ..... Unsent ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
+.tabmail-tab[type="folder"][SpecialFolder="Unsent Messages"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox),
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
 }
 
 /* ..... Drafts ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
 }
 
 /* ..... Templates ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Templates"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
 /* ..... Junk ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Junk"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
 /* ..... Trash ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Trash"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
 }
 
 /* ..... Saved Searches ..... */
 
+.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
 }
 
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+.tabmail-tab[type="folder"][NewMessages="true"],
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
   font-weight: bold;
 }
 
+.tabmail-tab[type="folder"][ImapShared="true"],
 treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
   -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-share.gif");
@@ -141,45 +152,47 @@ treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
 
 /* ..... Server Folders ..... */
 
+.tabmail-tab[type="folder"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
+.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
+.tabmail-tab[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  -moz-padding-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
   list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
 }
@@ -191,6 +204,7 @@ treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
   color: #FFCF00;
 }
 
+.tabmail-tab[type="folder"][IsServer="true"],
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
 treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
   font-weight: bold;

diff --git a/LCARStrek/messenger/mailWindow1.css b/LCARStrek/messenger/mailWindow1.css
index 01fc1a847104f507218d57a3dda747da59dc0878..0b8a2c46be368ce23976ddfbde1a8b7b69e1976d 100644 (file)
--- a/LCARStrek/messenger/mailWindow1.css
+++ b/LCARStrek/messenger/mailWindow1.css
@@ -55,7 +55,7 @@
   height: 0px;
 }
 
-#gray_vertical_splitter {
+#gray_vertical_splitter { /* XXX: can die when tabmail has landed */
   border: none;
 }
 
@@ -99,3 +99,7 @@ tabpanels {
   /* don't draw tabpanel borders; see also tabbrowser.css */
   -moz-appearance: none;
 }
+
+.tab-close-button {
+  margin: 0;
+}

diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css
index 7e57a799e11b5a55980c664be024369e2e334bf2..d30551dd1ea9d25688bb23c1d7e93ab7ffe3b7c6 100644 (file)
--- a/LCARStrek/messenger/threadPane.css
+++ b/LCARStrek/messenger/threadPane.css
@@ -205,25 +205,38 @@ treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   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) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
+}
 
 treechildren::-moz-tree-image(subjectCol) {
   -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
 }
 
 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");
 }
@@ -232,24 +245,34 @@ treechildren::-moz-tree-image(subjectCol, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offline.gif");
 }
 
+.tabmail-tab[type="message"][Attachment="true"][Offline="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");
 }
 
@@ -258,7 +281,7 @@ 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, 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");
 }
 
@@ -266,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");
 }