From 3f04bf2c835cd1111a38279a3234e0c84bb5ddfe Mon Sep 17 00:00:00 2001 From: "hewitt%netscape.com" Date: Thu, 6 Sep 2007 21:52:13 +0000 Subject: [PATCH] #52271 - [Modern] new secondary icons, r=german, sr=ben git-svn-id: svn://10.0.0.236/trunk@234408 18797224-902f-48f8-a5cc-f745e15eee43 --- .../communicator/bookmarks/bookmarks.css | 13 +-- .../bookmarks/bookmark-folder-closed.gif | Bin 350 -> 352 bytes .../bookmarks/bookmark-folder-open.gif | Bin 362 -> 570 bytes .../communicator/bookmarks/bookmark-item.gif | Bin 360 -> 198 bytes .../communicator/bookmarks/bookmarks.css | 7 +- .../modern/communicator/bookmarks/home.gif | Bin 225 -> 223 bytes .../communicator/directory/directory.css | 13 --- .../directory/file-folder-closed.gif | Bin 76 -> 345 bytes .../directory/file-folder-open.gif | Bin 79 -> 561 bytes .../communicator/directory/file-icon.gif | Bin 74 -> 329 bytes .../modern/communicator/profile/migrate.gif | Bin 135 -> 353 bytes .../modern/communicator/profile/profile.css | 7 +- .../modern/communicator/related/sitemap.gif | Bin 921 -> 149 bytes .../modern/communicator/search/category.gif | Bin 120 -> 382 bytes .../modern/communicator/search/result.gif | Bin 113 -> 368 bytes .../modern/communicator/tasksOverlay.css | 5 + mozilla/suite/themes/modern/global/tree.css | 9 -- mozilla/suite/themes/modern/jar.mn | 4 +- .../messenger/addressbook/addressbook.css | 6 +- .../themes/modern/messenger/folderPane.css | 100 +++++++++++------- .../themes/modern/messenger/messenger.css | 61 +++++++---- 21 files changed, 121 insertions(+), 104 deletions(-) diff --git a/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css b/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css index 01b06023afa..8b22130fa28 100644 --- a/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css +++ b/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css @@ -182,7 +182,7 @@ } .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#Folder"], - .treeitem-bookmark[container="true"][open="true"] + .treeitem-bookmark[container="true"] { list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } @@ -212,11 +212,6 @@ list-style-image : url("chrome://communicator/skin/bookmarks/location.gif"); } - .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavorite"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/iefavorite.gif"); - } - .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#Bookmark"] { list-style-image : url("chrome://communicator/skin/bookmarks/location.gif"); @@ -240,12 +235,6 @@ list-style-image : url("chrome://communicator/skin/directory/file-icon.gif"); } - .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"], - .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/iefolder.gif"); - } - /** * Bookmarks tree **/ diff --git a/mozilla/suite/themes/modern/communicator/bookmarks/bookmark-folder-closed.gif b/mozilla/suite/themes/modern/communicator/bookmarks/bookmark-folder-closed.gif index 10a0f93e9b6743ebbee5b4b440fece95ca4716f0..8c1694e40c6b4ca0d8d3b725eff07e2b32168833 100644 GIT binary patch literal 352 zcmZ?wbhEHb6krfwxN6FvXKnNP)0d2nuFWSe>^yhn$n`txj-1(d>Bh=KCr{meuz1gr zc{>lz*s}Nh{U`tb|1X+6vtrgF8~*?cchA1H+b3_>dFAo*z^t6=IZLZ%EvcEatYq4p zh|=;K&tCPc-Wrsh8&OggTUk@LV3ln^pi5Nr+|z+lRt15ya`69ZfAfmsC} zI#T`ajX|9vTr!Or3?DY0@SAudK;VUsMo%kKqJ#j4PWl7sdlga26J3}J^kNlOm;|i2 zKChZNm4%&Eye=j&xw(~7piYx9DJ89!SF28qv3n{jC$A`foi^i?mU#(2xxf_ox*?w}>p0gVcUfg!<+Md(5 z4qv=?;_9QbH=ka-^Ze!eFL_-{vfAcPUvnV6d3I{!^yK;}Np%wwYWiZzJEKb5;;VX8 zOl$&ks{FIcgYv3FiyDISYsHi_WV8(Q96ZguLTrQMTw^o6Q;Yup|9{}X0S1bJ;!hSv z1_n(A9gs;NKQXXXADB|$p(E9QtUstzq%NTUg>s74M7P;zKYV6jVPS4sl3<}Ap!EE) z^tw26rN9$ApUhcssXb|4)ieH74o)t?nwZ4o#%6Be8U_BOl(cRh(Hc4a&dFTdJiKBx pviy^p=FH=hs!`_^5D*j;77-N_myoQ{RNS?D&o1Bn2V5K(tN}p*c2)oY diff --git a/mozilla/suite/themes/modern/communicator/bookmarks/bookmark-folder-open.gif b/mozilla/suite/themes/modern/communicator/bookmarks/bookmark-folder-open.gif index 08ab2c1c314a7cbaeaa73f1b7b3cf33f722195f3..4c3bfd326651bffe7e237bfd58e7557013d0e8ac 100644 GIT binary patch literal 570 zcmZ?wbhEHb6krfwc;?HXXKj(Q_IAP--aPj`*-RG}vJAJ8o)`IqBYcD@~e&F)W zvT1Xg7p|zCyZGRx8<}lgoy*tVd-*1_v!`|Os&jW9W_9(Zw{&hkdA?-oEa%9mQ+FQZ z_Dl@S%4u4#yr6%|qTPpE7OmWU?#ja5hcDcFwEfKGwxw&XKYkujQnq;SkyVFIoxA^J z>E5HK?>zKQOs<+azh=&&qu1`t+P;6!g=-I9z1@H5M#c2GN3Pv2o-*_Q|Nli3ryaU{ z)7aU$e*RL1!3q?AvM@3*_%i5#90-aN2KMO<7t!?e?j9pzFO^hB)6PXyyb!;_- zg_{|fn3?(bnVdzuSXsHf`{pjN5aQuAapGoXSmns6zm8W-RElfMDo!ItmZK~#TsB*} zyWI@cEv*@}tPU_LnyEOjyK6`baxh39@MSa>bhQ(=m-S&2V0iLWj!jp_K-pA6L5X4O fY*s#%!o~#F79n|`KhjUuFFf4ZtK`MQ!e9*mTKB`X literal 362 zcmZ?wbhEHb6krfwxXQrLy=X`8l3jgEc1>KqXX>i`GuIxRyYa}vEyovZKDJ`lnH9TE zuiJlN^Wn?ej$PY%^2WZiw|AYmw)gan!x!)EJ9G2I)kkMVmDs79e>IuoOQ!%j#Eou-` z(vZT}~)$cwv zs8eKB(hQ9>*6N*6E3X8!GBU6*pE<@9s3D`1Zf||hdexTZyk~werf<;RVSQ!s=IXQ@Y)RAFNdZKfxA<%;%a4O>x0n2$J%=ZsxPU4Z` cC>n8 z@87?A_3HWa=TDzLee~$jg9i`p-o1P2(xo$J&a7U&dgjcT)2C1G=;&x^X{oNRE-5KV zOG|Tgb+xdtIB?(q1L;8VCkrD3gC2tpNGr%s3~a3q(+fOwq~tvwZ=B@eGevLGmx&EL zbG$BPd~s0V;>p>#Mb=WJ{h*VLNw1HZplhN8#|^#h8S=9<4lw4ZD-{&T3vsb2ZF$>T1*Hmn6l@#O>aM6;JogyVEA+95^*jY6PMQqWibG SY9H3tIi`Ce;FOCagEauYB#9jW diff --git a/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css b/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css index 5cac4a95daa..5a8a0edaf4b 100644 --- a/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css +++ b/mozilla/suite/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/suite/themes/modern/communicator/bookmarks/home.gif b/mozilla/suite/themes/modern/communicator/bookmarks/home.gif index a1a03346fa35ae6690cf9f60a4a5beb3dae8819c..2e69f3242c7047a4255c3f98994b093fb6ba2fe0 100644 GIT binary patch literal 223 zcmZ?wbhEHb6ky{WQ<5%>T~d=ib;=&=lfGD8oYa4&R8v&!#eR%slm>K%>HLJjXS5$%4Xme P;HzT_?+8~`WUvMRj%j0< literal 225 zcmZ?wbhEHb6krfwIKseCJ8gaA%#EE3wohEXXXe_23%49!vFpr+gBN$6ym8{{qq8@k zp1St%;+^L&-+jqyn}6{9om-DzKYIBgy?J(OAE%|9{}X0R{}9 z_>+Z^fkBc%2P6ZslYuoZL9Oqm>%8YzBQ#bq@!jsy7dTQZ%fUR)j6u3T;KN0!19uxT z3V!Ha=$=%$AtH5Y$AOnD3Oyzs@3|@)yak-j-13;C-}7ke!U+kP-OuJ2?wmd=TZ~6U Qv`##{Biy)KNs+-C0DW6yM*si- diff --git a/mozilla/suite/themes/modern/communicator/directory/directory.css b/mozilla/suite/themes/modern/communicator/directory/directory.css index 9778b5d9b3f..09d0ee66090 100644 --- a/mozilla/suite/themes/modern/communicator/directory/directory.css +++ b/mozilla/suite/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/suite/themes/modern/communicator/directory/file-folder-closed.gif b/mozilla/suite/themes/modern/communicator/directory/file-folder-closed.gif index abbc4b8e74dfd12aee24e0ca9593a8e58c3f4115..b97860c1e4e7f91e6148079acd7fbee929cc1d94 100644 GIT binary patch literal 345 zcmZ?wbhEHb6ky^yhn$n`txj-1(d>Bh=KCr{meuz1gr zc{>lz*s}Nh{U`tb|1X+6vtrgF8~*?cchA1H+b3_>dFAo*z^t6=IZLZ%EvcEatYq4p zh|=;K&tCPc-Wrsh8&OggTUk@LV3ln^pi5Nr+|z+lRt15ya`69Ze>fms0# zDqQ_1W*rdBU}KQ)ek0N;!`gVR(Q_IAP--aPj`*-RG}vJAJ8o)`IqBYcD@~e&F)W zvT1Xg7p|zCyZGRx8<}lgoy*tVd-*1_v!`|Os&jW9W_9(Zw{&hkdA?-oEa%9mQ+FQZ z_Dl@S%4u4#yr6%|qTPpE7OmWU?#ja5hcDcFwEfKGwxw&XKYkujQnq;SkyVFIoxA^J z>E5HK?>zKQOs<+azh=&&qu1`t+P;6!g=-I9z1@H5M#c2GN3Pv2o-*_Q|Nli3ryaU{ z)7aU$e*RL1!3q?AvM@3*_%i5#90-aN2KK%N-zLVEmZtU&Uq%n6UM2=}9a~Ld;dVwQ zW@bKqCT9^ZR#tBB=9zOWgm`#OoVb}8mN|0jui_OGmEzj4jMIpbB<-=n@T7sF>IX9%I>Mh Vp{+3GM}pJ+g*6<)$GBJ+tO1_kzNP>G literal 79 zcmZ?wbhEHb6kyN!h$R&R~3so!++!n~aacb>bF+S1;) zW?RX$ITf=Or8KoJ+f6J+hNexY9 zGv+7MHO}6?fAYqi`!C%nnKrj??e_J@&Mw(^v~t$s6$ekGcXaiy+rI7erE~Y6Oxd_= z(Vip6Z{91KGV92-JIPHgD-WJzAO$G?WMO1rFl5jHX#)9)fi3O83aE&`6F54NOLt34bUtO1y#f;IpE literal 74 zcmZ?wbhEHb6kyaS@!Y#KA1ki&t=ump*k->--=i_z fo_UGFiYQheO_k%iS+cQu6Ihn@oJ@3PVz34PMd>cl diff --git a/mozilla/suite/themes/modern/communicator/profile/profile.css b/mozilla/suite/themes/modern/communicator/profile/profile.css index 7c3df8ca6e0..9354a1dfcfb 100644 --- a/mozilla/suite/themes/modern/communicator/profile/profile.css +++ b/mozilla/suite/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/suite/themes/modern/communicator/related/sitemap.gif b/mozilla/suite/themes/modern/communicator/related/sitemap.gif index dab90b7bd557d7bb657df78a616c5d4837d637a8..7539887702288d034a4687529628a9856dde8703 100644 GIT binary patch literal 149 zcmZ?wbhEHb6krfw*v!qKXKj|I&@vs#+WWfdBvh2W98FM#V6o z0>z&!j0_Ci3_2iTkQodtP6a1DSMwfJDb?XUVIa_8&YG+^<(bfmL$`K0#Gb!&_tu`= pmm&+aH^1aDmErVo32JlG5pfjtJsGp%wf3^NntOK?XfrWb0|32YGxGod literal 921 zcmV;K17`e3Nk%w1VGsZi0QUd@0001h0001h0Dyo1004l10Du61fWW}Oz}%J2aJ z0S*oj4-gFw5f%^*4G|6$6c!E<5fK*{CmJIb93v_v77QsI7BLH91E&IB7gWA2&!e2|{=|LQXtMV^16#NF60lEgDWVEM_hoWh*CV zC^KX^C}%k|bu1@yCOCFDDt0?GM>|DFJZoq>Ok_N0Lqr}`MmldvG<0Y;QB6-!S7}sd zR9R(qXjn~WS!HfwS#51^4mpJmMUM+qvIAhhGe?pyQmh45#{*~E0B_?mUCA(F*HBZ5 zQd_NDY=&EEqG?o)a9XNsb%9r)rCC0DvvS$O?HZT>-X@LFT@Re0@fQR{GSk5`S1Tc(M5hm2^nrd@`iT%omW zjp2I51$qL4gMR{rhJC zz&?itBmVOzvEs#o2J}tbSm2*Ui~|j99BBX_0EQs(aU@xB0DyuUB}x?F(q=)M0yrKp v+3+U80s8({MrR8YvwGw@$6N_tVKzUO_v`%Pi=0Ct*l9J>oj(Du3NCG zXZ6;C2~$g^&B^PVoYK^q(=!q19wLF_PZmZ71|tR?kb01x7}#bz%naCJAR%@*<&r~& z5YMS6i&lE@aGY4tlPSw16p*^`z?VAFhl!4YGpdBU8XXr0vPVd)3srDX2ytR%l#mtU zuIXTBXJ|}jHPFamWMtwKVQ-u?nV*-3gNc3Gj3zO0QK7jUf&vQ`X)-QbF>kdn|5|o+ y#^o!w@Jmb97^yODS|zYmT3NTpNM21_QAtikK~GXf-|&nP!`*xL?>aj&SOWmw^^X+* literal 120 zcmZ?wbhEHb6krfwSoELaKM0&TbLRhn0|#c#{GXO~MoCGDfq_BsCkrD312cmTkPTER z0A$-*?7H*M;8bLm;wA<~j}6xr6{eg_Y<4So^GfX0i)}fDOAf3lH}iXMdv(3&oi}L* W7wU0jHRUxoA1qiAwSGGbgEau--82mV diff --git a/mozilla/suite/themes/modern/communicator/search/result.gif b/mozilla/suite/themes/modern/communicator/search/result.gif index cce7ebb38684b743517eace27726faa8704d7458..b0505ef1cfc6818db38a16690dba9aa51dd391f9 100755 GIT binary patch literal 368 zcmV-$0gwJiNk%w1VGsZi0M$JJmzS3S003rY%$b@0Gc#spGc*7H|IEz)U|?XGW;4vp z%>T@p?d|R9>FM(F^85SyHa0f*_xIl3-th47si~=EW@bA(JI&3_Q&UqjGc%r^p85It z-{0Tk(bKFn`1V|-}!n6(s z2dFZqV1B^{aZ;n0eh-F$dI(Sey4FA-I=b*|2zr7A1xY$90EvnX0SOC*LOU)m933|e z3=9DUj*ur3ii!>Zo1Hx+EHNrG4lNrgGCie*G#{af1{OkkLLd`05f3H?#1K&xC#~S?4=9< literal 113 zcmZ?wbhEHb6krfwSoELa|NsBz&h0;Q=8U?!3Ih^Q{K>)y;_841kXi?3Gmg!7J`}WE zSh1w=m96`;Ip1R*C)=z`|e+ E04zW!1^@s6 diff --git a/mozilla/suite/themes/modern/communicator/tasksOverlay.css b/mozilla/suite/themes/modern/communicator/tasksOverlay.css index 29c0cc2368d..c28656dd3fc 100644 --- a/mozilla/suite/themes/modern/communicator/tasksOverlay.css +++ b/mozilla/suite/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/suite/themes/modern/global/tree.css b/mozilla/suite/themes/modern/global/tree.css index 58dd83bc41f..31de3e70820 100644 --- a/mozilla/suite/themes/modern/global/tree.css +++ b/mozilla/suite/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/suite/themes/modern/jar.mn b/mozilla/suite/themes/modern/jar.mn index cd785a755d5..d6aa7bd82ab 100644 --- a/mozilla/suite/themes/modern/jar.mn +++ b/mozilla/suite/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/suite/themes/modern/messenger/addressbook/addressbook.css b/mozilla/suite/themes/modern/messenger/addressbook/addressbook.css index 0fa84b15305..a34eca0034a 100644 --- a/mozilla/suite/themes/modern/messenger/addressbook/addressbook.css +++ b/mozilla/suite/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/suite/themes/modern/messenger/folderPane.css b/mozilla/suite/themes/modern/messenger/folderPane.css index cb7443ea0e0..056abd7d05c 100644 --- a/mozilla/suite/themes/modern/messenger/folderPane.css +++ b/mozilla/suite/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/suite/themes/modern/messenger/messenger.css b/mozilla/suite/themes/modern/messenger/messenger.css index efac6c6fde7..23e347ae40c 100644 --- a/mozilla/suite/themes/modern/messenger/messenger.css +++ b/mozilla/suite/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"); }