--- a/mail/themes/linux/mail/folderPane.css
+++ b/mail/themes/linux/mail/folderPane.css
@@ -115,109 +115,84 @@ treechildren::-moz-tree-image(folderName
/* ..... Feed ..... */
.tabmail-tab[type="folder"][ServerType="rss"],
treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
-moz-image-region: rect(0 16px 16px 0);
}
-/* ..... Account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"] {
- list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
- -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-/* ..... Secure IMAP/POP account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"] {
- list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
- -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-/* ..... Local folders ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"] {
- list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
- -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-/* ..... News server ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"] {
- list-style-image: url("chrome://messenger/skin/icons/server.png");
- -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Secure news server ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"] {
- list-style-image: url("chrome://messenger/skin/icons/server.png");
- -moz-image-region: rect(0px 64px 16px 80px);
-}
-
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
font-weight: bold;
}
/* ..... Mail server ..... */
+.tabmail-tab[type="folder"][IsServer="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true) {
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(16px 16px 32px 0px);
}
/* ..... Secure mail server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(16px 32px 32px 16px);
}
/* ..... Local folders ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(0px 16px 16px 0px);
}
/* ..... News server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 64px 16px 48px);
}
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 80px 16px 64px);
}
/* ..... Feed server ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(32px 16px 48px 0px);
}
/* ::::: All Servers ::::: */
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
color: -moz-hyperlinktext;
}
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected) {
color: -moz-CellHighlightText;
}
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected, focus),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
color: HighlightText;
}
treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
font-weight: bold;
}
--- a/mail/themes/osx/mail/folderPane.css
+++ b/mail/themes/osx/mail/folderPane.css
@@ -197,17 +197,17 @@ treechildren::-moz-tree-image(folderName
}
}
/* ..... Server Folders ..... */
/* ..... Account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true),
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 16px 16px 0);
}
/* ..... Secure IMAP/POP account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
@@ -242,17 +242,17 @@ treechildren::-moz-tree-image(folderName
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 96px 16px 80px);
}
@media (min-resolution: 2dppx) {
/* ..... Account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true),
- treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+ treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-moz-image-region: rect(0 32px 32px 0);
}
/* ..... Secure IMAP/POP account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
@@ -286,17 +286,17 @@ treechildren::-moz-tree-image(folderName
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-moz-image-region: rect(0 192px 32px 160px);
}
}
/* ::::: All Servers ::::: */
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
font-weight: bold;
color: blue;
}
treechildren::-moz-tree-cell-text(subfoldersHaveUnreadMessages-true) {
font-weight: bold;
--- a/mail/themes/windows/mail/folderPane-aero.css
+++ b/mail/themes/windows/mail/folderPane-aero.css
@@ -1,28 +1,28 @@
/* 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/. */
%include folderPane.css
@media all and (-moz-windows-default-theme) {
- treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
+ treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
color: -moz-hyperlinktext;
}
- treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected),
+ treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected) {
color: -moz-hyperlinktext;
}
- treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected, focus),
+ treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
color: -moz-hyperlinktext;
}
}
#folderTree treechildren::-moz-tree-indentation {
width: 8px;
--- a/mail/themes/windows/mail/folderPane.css
+++ b/mail/themes/windows/mail/folderPane.css
@@ -136,119 +136,93 @@ treechildren::-moz-tree-image(folderName
/* ..... Saved Search Folder ..... */
.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual),
treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, open) {
-moz-image-region: rect(0 176px 16px 160px);
}
-/* ..... Account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"] {
- list-style-image: url("chrome://messenger/skin/icons/server.png");
- -moz-image-region: rect(0 16px 16px 0);
-}
-
-/* ..... Secure IMAP/POP account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"] {
- -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* ..... Local folders ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"] {
- -moz-image-region: rect(0 48px 16px 32px);
-}
-
-/* ..... News server ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"] {
- -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Secure news server ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"] {
- -moz-image-region: rect(0 80px 16px 64px);
-}
-
-/* ..... Newsgroup ..... */
-.tabmail-tab[type="folder"][ServerType="nntp"] {
- -moz-image-region: rect(0 160px 16px 144px);
-}
-
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
font-weight: bold;
}
/* ..... Mail server ..... */
+.tabmail-tab[type="folder"][IsServer="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true),
-+treechildren::-moz-tree-image(folderNameCol, isServer-true, open) {
+treechildren::-moz-tree-image(folderNameCol, isServer-true, open) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 16px 16px 0);
}
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
-moz-image-region: rect(16px 16px 32px 0);
}
/* ..... Secure mail server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-moz-image-region: rect(0 32px 16px 16px);
}
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
+treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail, isSecure-true) {
-moz-image-region: rect(16px 32px 32px 16px);
}
/* ..... Local folders ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-moz-image-region: rect(0 48px 16px 32px);
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none, biffState-NewMail) {
-moz-image-region: rect(16px 48px 32px 32px);
}
/* ..... News server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-moz-image-region: rect(0 64px 16px 48px) !important;
}
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-moz-image-region: rect(0 80px 16px 64px) !important;
}
/* ..... Feed server ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
list-style-image: url("chrome://messenger-newsblog/skin/icons/server-rss.png");
-moz-image-region: rect(0 16px 16px 0);
}
/* ::::: All Servers ::::: */
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
color: blue;
}
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected) {
color: -moz-CellHighlightText;
}
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true, selected, focus),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
color: HighlightText;
}
treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
font-weight: bold;
}