diff --git a/mozilla/themes/modern/communicator/bookmarks/bookmarks.css b/mozilla/themes/modern/communicator/bookmarks/bookmarks.css index 5cac4a95daa..5a8a0edaf4b 100644 --- a/mozilla/themes/modern/communicator/bookmarks/bookmarks.css +++ b/mozilla/themes/modern/communicator/bookmarks/bookmarks.css @@ -70,7 +70,7 @@ treeitem[status="new"] > treerow > .treecell-bookmark treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark, treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark, -treeitem[container="true"][open="true"] > treerow > .treecell-bookmark +treeitem[container="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } @@ -123,11 +123,6 @@ treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > . list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecell-bookmark -{ - list-style-image: url("chrome://communicator/skin/bookmarks/iefavorite.gif"); -} - treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); diff --git a/mozilla/themes/modern/communicator/directory/directory.css b/mozilla/themes/modern/communicator/directory/directory.css index bc415e29978..ceefd79eb03 100644 --- a/mozilla/themes/modern/communicator/directory/directory.css +++ b/mozilla/themes/modern/communicator/directory/directory.css @@ -37,28 +37,15 @@ list-style-image : url("chrome://communicator/skin/directory/file-icon.gif"); } -treeitem[selected="true"] > treerow > .treecell-filename - { - list-style-image : url("chrome://communicator/skin/directory/file-icon-sel.gif"); - } - treeitem[container="true"] > treerow > .treecell-filename { list-style-image : url("chrome://communicator/skin/directory/file-folder-closed.gif"); } -treeitem[container="true"][selected="true"] > treerow > .treecell-filename - { - list-style-image : url("chrome://communicator/skin/directory/file-folder-closed-sel.gif"); - } treeitem[container="true"][open="true"] > treerow > .treecell-filename { list-style-image : url("chrome://communicator/skin/directory/file-folder-open.gif"); } -treeitem[container="true"][open="true"][selected="true"] > treerow > .treecell-filename - { - list-style-image : url("chrome://communicator/skin/directory/file-folder-open-sel.gif"); - } /* Show an animated icon when a directory/symlink is loading */ diff --git a/mozilla/themes/modern/communicator/profile/profile.css b/mozilla/themes/modern/communicator/profile/profile.css index 7c3df8ca6e0..9354a1dfcfb 100644 --- a/mozilla/themes/modern/communicator/profile/profile.css +++ b/mozilla/themes/modern/communicator/profile/profile.css @@ -34,8 +34,11 @@ window.dialog { color: #99cccc ! important; } -/** icon courtesy of chris nelson, chrisn@statecollege.com **/ -treeitem[rowMigrate="no"] > treerow > treecell > .tree-button { +#profiles > treechildren > treeitem > treerow > treecell > .tree-cell-icon { + list-style-image: url("chrome://communicator/skin/profile/profileicon-large.gif"); +} + +#profiles > treechildren > treeitem > treerow > treecell[rowMigrate="no"] > .tree-cell-icon { list-style-image: url("chrome://communicator/skin/profile/migrate.gif"); } diff --git a/mozilla/themes/modern/communicator/tasksOverlay.css b/mozilla/themes/modern/communicator/tasksOverlay.css index 29c0cc2368d..c28656dd3fc 100644 --- a/mozilla/themes/modern/communicator/tasksOverlay.css +++ b/mozilla/themes/modern/communicator/tasksOverlay.css @@ -23,6 +23,11 @@ list-style-image : url("chrome://global/skin/taskbar-mailnew.gif"); } +#mini-mail[BiffState="NewMail"]:hover:active + { + list-style-image : url("chrome://global/skin/taskbar-mailnew-clicked.gif"); + } + #mini-addr { list-style-image : url("chrome://global/skin/taskbar-addressbook.gif"); diff --git a/mozilla/themes/modern/global/tree.css b/mozilla/themes/modern/global/tree.css index 58dd83bc41f..31de3e70820 100644 --- a/mozilla/themes/modern/global/tree.css +++ b/mozilla/themes/modern/global/tree.css @@ -119,10 +119,6 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow { border: 1px solid #AECDCD; } -treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty { - list-style-image: url("chrome://global/skin/closedtwisty-selected.gif"); -} - .tree-cell-twisty:hover { text-decoration: none; } @@ -139,11 +135,6 @@ treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty list-style-image: url("chrome://global/skin/opentwisty.gif"); } -treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-cell-twisty { - list-style-image: url("chrome://global/skin/opentwisty-selected.gif"); -} - - /* tree header with sort direction indicators */ .sortDirectionIndicator[sortDirection="ascending"] > .tree-header-sortdirection { list-style-image: url("chrome://global/skin/sortAscending.gif"); diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn index cd785a755d5..d6aa7bd82ab 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -163,6 +163,7 @@ modern.jar: skin/modern/global/taskbar-composer.gif (global/taskbar-composer.gif) skin/modern/global/taskbar-mail.gif (global/taskbar-mail.gif) skin/modern/global/taskbar-mailnew.gif (global/taskbar-mailnew.gif) + skin/modern/global/taskbar-mailnew-clicked.gif (global/taskbar-mailnew-clicked.gif) skin/modern/global/taskbar-navigator.gif (global/taskbar-navigator.gif) skin/modern/global/taskbar-popup-arrow.gif (global/taskbar-popup-arrow.gif) skin/modern/global/taskbar-tab-hover.gif (global/taskbar-tab-hover.gif) @@ -385,7 +386,6 @@ modern.jar: skin/modern/messenger/folder-inbox-share.gif (messenger/folder-inbox-share.gif) skin/modern/messenger/folder-inbox.gif (messenger/folder-inbox.gif) skin/modern/messenger/folder-mailserver.gif (messenger/folder-mailserver.gif) - skin/modern/messenger/folder-new-closed.gif (messenger/folder-new-closed.gif) skin/modern/messenger/folder-new-open.gif (messenger/folder-new-open.gif) skin/modern/messenger/folder-new.gif (messenger/folder-new.gif) skin/modern/messenger/folder-newsgroup-new.gif (messenger/folder-newsgroup-new.gif) @@ -711,6 +711,8 @@ modern.jar: skin/modern/editor/images/right_hover.gif (editor/images/right_hover.gif) skin/modern/editor/images/underline_active.gif (editor/images/underline_active.gif) skin/modern/editor/images/underline_hover.gif (editor/images/underline_hover.gif) + skin/modern/messenger/addressbook/directory.gif (messenger/addressbook/directory.gif) + skin/modern/messenger/addressbook/directory-open.gif (messenger/addressbook/directory-open.gif) skin/modern/messenger/addressbook/abnewmsg.gif (messenger/addressbook/abnewmsg.gif) skin/modern/messenger/addressbook/addressbook.css (messenger/addressbook/addressbook.css) skin/modern/messenger/addressbook/edit.gif (messenger/addressbook/edit.gif) diff --git a/mozilla/themes/modern/messenger/addressbook/addressbook.css b/mozilla/themes/modern/messenger/addressbook/addressbook.css index 0fa84b15305..a34eca0034a 100644 --- a/mozilla/themes/modern/messenger/addressbook/addressbook.css +++ b/mozilla/themes/modern/messenger/addressbook/addressbook.css @@ -115,10 +115,12 @@ tree[class="abDirectory"] treeitem > treerow > treecell > .tree-cell-primary-ico list-style-image: url("chrome://messenger/skin/addressbook/myaddrbk.gif"); } +tree[class="abDirectory"] treeitem > treerow > treecell[IsMailList="true"] > .tree-cell-primary-icon { + list-style-image: url("chrome://messenger/skin/addressbook/list.gif"); +} + tree[class="abResults"] treeitem > treerow > treecell.cardicon { list-style-image: url("chrome://messenger/skin/addressbook/person.gif"); - height: 14px; - min-height: 14px; } diff --git a/mozilla/themes/modern/messenger/folder-inbox-share.gif b/mozilla/themes/modern/messenger/folder-inbox-share.gif index 90afaa65c6d..c6074b93a0f 100644 Binary files a/mozilla/themes/modern/messenger/folder-inbox-share.gif and b/mozilla/themes/modern/messenger/folder-inbox-share.gif differ diff --git a/mozilla/themes/modern/messenger/folderPane.css b/mozilla/themes/modern/messenger/folderPane.css index cb7443ea0e0..056abd7d05c 100644 --- a/mozilla/themes/modern/messenger/folderPane.css +++ b/mozilla/themes/modern/messenger/folderPane.css @@ -24,7 +24,7 @@ list-style-image: url("chrome://messenger/skin/folder-closed.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon { list-style-image: url("chrome://messenger/skin/folder-open.gif"); } @@ -35,17 +35,57 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon list-style-image: url("chrome://messenger/skin/folder-inbox.gif"); } +.folderTreeItem[selected="true"][SpecialFolder="Inbox"] > treerow > .tree-cell-folderpane-icon +{ + list-style-image: url("chrome://messenger/skin/folder-inbox-open.gif"); +} + +.tree-cell-folderpane-icon[SpecialFolder="Sent"] +{ + list-style-image: url("chrome://messenger/skin/folder-sent.gif"); +} + +.folderTreeItem[selected="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon +{ + list-style-image: url("chrome://messenger/skin/folder-sent-open.gif"); +} + +.tree-cell-folderpane-icon[SpecialFolder="Drafts"] +{ + list-style-image: url("chrome://messenger/skin/folder-draft.gif"); +} + +.folderTreeItem[selected="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon +{ + list-style-image: url("chrome://messenger/skin/folder-draft-open.gif"); +} + +.tree-cell-folderpane-icon[SpecialFolder="Templates"] +{ + list-style-image: url("chrome://messenger/skin/folder-template.gif"); +} + +.folderTreeItem[selected="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon +{ + list-style-image: url("chrome://messenger/skin/folder-template-open.gif"); +} + .tree-cell-folderpane-icon[SpecialFolder="Trash"] { list-style-image: url("chrome://messenger/skin/folder-trash.gif"); } +.folderTreeItem[selected="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon +{ + list-style-image: url("chrome://messenger/skin/folder-trash-open.gif"); +} + .tree-cell-folderpane-icon[IsServer="true"] { list-style-image: url("chrome://messenger/skin/server-mail.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"] +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"] { list-style-image: url("chrome://messenger/skin/server-mail.gif"); } @@ -55,7 +95,7 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsSe list-style-image: url("chrome://messenger/skin/server-mail-new.gif"); } -treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"] +treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"] { list-style-image: url("chrome://messenger/skin/server-mail-new.gif"); } @@ -63,73 +103,57 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail" /* differentiate new messages on inbox/folders from biff on the server */ .tree-cell-folderpane-icon[NewMessages="true"] { - list-style-image: url("chrome://messenger/skin/folder-new-closed.gif"); - font-weight: bold; + list-style-image: url("chrome://messenger/skin/folder-new.gif"); + font-weight: bold; } -.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"] -{ - list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif"); - font-weight: bold; -} - -treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"] +treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"] { list-style-image: url("chrome://messenger/skin/folder-new-open.gif"); font-weight: bold; } +.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"], +treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"][SpecialFolder="Inbox"] +{ + list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif"); + font-weight: bold; +} /* IMAP folders */ -.tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"] +.tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"], +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"] { list-style-image: url("chrome://messenger/skin/server-remote-lock.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"] -{ - list-style-image: url("chrome://messenger/skin/server-remote-lock.gif"); -} - /* Local servers */ -.tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] +.tree-cell-folderpane-icon[IsServer="true"][ServerType="none"], +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] { list-style-image: url("chrome://messenger/skin/server-local.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] -{ - list-style-image: url("chrome://messenger/skin/server-local.gif"); -} - - /* News folders */ -.tree-cell-folderpane-icon[ServerType="nntp"] +.tree-cell-folderpane-icon[ServerType="nntp"], +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[ServerType="nntp"] { list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif"); } -.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"] +.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"], +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"] { list-style-image: url("chrome://messenger/skin/server-news-lock.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"] -{ - list-style-image: url("chrome://messenger/skin/server-news-lock.gif"); -} - -.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] +.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"], +.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] { list-style-image: url("chrome://messenger/skin/server-news.gif"); } -treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] -{ - list-style-image: url("chrome://messenger/skin/server-news.gif"); -} - /*All Servers*/ .tree-folder-row[IsServer="true"] { diff --git a/mozilla/themes/modern/messenger/messenger.css b/mozilla/themes/modern/messenger/messenger.css index efac6c6fde7..23e347ae40c 100644 --- a/mozilla/themes/modern/messenger/messenger.css +++ b/mozilla/themes/modern/messenger/messenger.css @@ -311,40 +311,59 @@ menu[open="true"] > #button-file list-style-image : url("chrome://global/skin/stop-clicked.gif"); } +/* .......... folderPane icons ..................... */ -.folderMenuItem > .menu-left { +.folderMenuItem > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/folder-closed.gif"); } -.folderMenuItem[open="true"] > .menu-left { +.folderMenuItem[open="true"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/folder-open.gif"); } -/* special folder */ -.folderMenuItem[SpecialFolder="Inbox"] > .menu-left { +/* special folders */ + +.folderMenuItem[SpecialFolder="Inbox"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/folder-inbox.gif"); } -.folderMenuItem[SpecialFolder="Inbox"][open="true"] > .menu-left -{ - list-style-image: url("chrome://messenger/skin/folder-inbox.gif"); +.folderMenuItem[SpecialFolder="Inbox"][open="true"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-inbox-open.gif"); } -.folderMenuItem[SpecialFolder="Trash"] > .menu-left { +.folderMenuItem[SpecialFolder="Sent"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-sent.gif"); +} + +.folderMenuItem[SpecialFolder="Sent"][open="true"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-sent-open.gif"); +} + +.folderMenuItem[SpecialFolder="Drafts"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-draft.gif"); +} + +.folderMenuItem[SpecialFolder="Drafts"][open="true"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-draft-open.gif"); +} + +.folderMenuItem[SpecialFolder="Templates"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-template.gif"); +} + +.folderMenuItem[SpecialFolder="Templates"][open="true"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-template-open.gif"); +} + +.folderMenuItem[SpecialFolder="Trash"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/folder-trash.gif"); } -.folderMenuItem[SpecialFolder="Trash"][open="true"] > .menu-left { - list-style-image: url("chrome://messenger/skin/folder-trash.gif"); +.folderMenuItem[SpecialFolder="Trash"][open="true"] > .menu-iconic-left { + list-style-image: url("chrome://messenger/skin/folder-trash-open.gif"); } -.folderMenuItem[IsServer="true"] > .menu-left -{ - list-style-image: url("chrome://messenger/skin/server-mail.gif"); -} - -.folderMenuItem[IsServer="true"][open="true"] > .menu-left -{ +.folderMenuItem[IsServer="true"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/server-mail.gif"); } @@ -355,21 +374,21 @@ menu[open="true"] > #button-file } /* Local Servers */ -.folderMenuItem[IsServer="true"][ServerType="none"] > .menu-left +.folderMenuItem[IsServer="true"][ServerType="none"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/server-local.gif"); } /* News folders */ -.folderMenuItem[ServerType="nntp"] > .menu-left { +.folderMenuItem[ServerType="nntp"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif"); } -.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] > .menu-left { +.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/server-news-lock.gif"); } -.folderMenuItem[IsServer="true"][ServerType="nntp"] > .menu-left { +.folderMenuItem[IsServer="true"][ServerType="nntp"] > .menu-iconic-left { list-style-image: url("chrome://messenger/skin/server-news.gif"); } diff --git a/mozilla/themes/modern/preview.gif b/mozilla/themes/modern/preview.gif index b094261c896..c9c1371b45c 100644 Binary files a/mozilla/themes/modern/preview.gif and b/mozilla/themes/modern/preview.gif differ