Bug 491366 - Selected items in the sidebar should look like they do in Finder, r=philor
authorMarkus Stange <mstange@themasta.com>
Tue, 05 May 2009 16:56:37 +0200
changeset 2558 53b12c77aab70cf152a630b0bd0f7735985c6f0a
parent 2557 c582818fbd155d191e0bae4dbac777b6eea59d3c
child 2559 54b3c5e6cd1189cf58de5bd7bd2237e4acde48e8
push idunknown
push userunknown
push dateunknown
reviewersphilor
bugs491366
Bug 491366 - Selected items in the sidebar should look like they do in Finder, r=philor
mail/themes/pinstripe/jar.mn
mail/themes/pinstripe/mail/addrbook/addressbook.css
mail/themes/pinstripe/mail/icons/foldertree-selected-background.png
mail/themes/pinstripe/mail/icons/foldertree-selected-unfocused.png
mail/themes/pinstripe/mail/icons/sidebar-item.png
mail/themes/pinstripe/mail/icons/tree-selected-overlay.png
mail/themes/pinstripe/mail/mailWindow1.css
--- a/mail/themes/pinstripe/jar.mn
+++ b/mail/themes/pinstripe/jar.mn
@@ -119,17 +119,17 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignNotOk.gif            (mail/smime/hdrSignNotOk.gif)
   skin/classic/messenger/smime/icons/hdrCryptoOk.gif             (mail/smime/hdrCryptoOk.gif)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.gif          (mail/smime/hdrCryptoNotOk.gif)
   skin/classic/messenger/icons/chevron.png                       (mail/icons/chevron.png)
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
   skin/classic/messenger/icons/twisty-closed.gif                 (mail/icons/twisty-closed.gif)
   skin/classic/messenger/icons/spin-buttons-active.png           (mail/icons/spin-buttons-active.png)
   skin/classic/messenger/icons/spin-buttons.png                  (mail/icons/spin-buttons.png)
-  skin/classic/messenger/icons/tree-selected-overlay.png         (mail/icons/tree-selected-overlay.png)
+  skin/classic/messenger/icons/sidebar-item.png                  (mail/icons/sidebar-item.png)
   skin/classic/messenger/icons/search-bar-background.png         (mail/icons/search-bar-background.png)
   skin/classic/messenger/icons/attachment-deleted.png            (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png      (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/attachment-col.png                (mail/icons/attachment-col.png)
   skin/classic/messenger/icons/attachment-selected.png           (mail/icons/attachment-selected.png)
   skin/classic/messenger/icons/attachment.png                    (mail/icons/attachment.png)
   skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
@@ -141,18 +141,16 @@ classic.jar:
   skin/classic/messenger/icons/folder-junk.png                   (mail/icons/folder-junk.png)
   skin/classic/messenger/icons/folder-newsgroup.png              (mail/icons/folder-newsgroup.png)
   skin/classic/messenger/icons/folder-open.png                   (mail/icons/folder-open.png)
   skin/classic/messenger/icons/folder-outbox.png                 (mail/icons/folder-outbox.png)
   skin/classic/messenger/icons/folder-sent.png                   (mail/icons/folder-sent.png)
   skin/classic/messenger/icons/folder-share.png                  (mail/icons/folder-share.png)
   skin/classic/messenger/icons/folder-template.png               (mail/icons/folder-template.png)
   skin/classic/messenger/icons/folder-trash.png                  (mail/icons/folder-trash.png)
-  skin/classic/messenger/icons/foldertree-selected-background.png  (mail/icons/foldertree-selected-background.png)
-  skin/classic/messenger/icons/foldertree-selected-unfocused.png (mail/icons/foldertree-selected-unfocused.png)
   skin/classic/messenger/icons/group-background.gif              (mail/icons/group-background.gif)
   skin/classic/messenger/icons/junk-column-header.png            (mail/icons/junk-column-header.png)
   skin/classic/messenger/icons/local-mailhost.png                (mail/icons/local-mailhost.png)
   skin/classic/messenger/icons/mail-16.png                       (mail/icons/mail-16.png)
   skin/classic/messenger/icons/mail-toolbar-small.png            (mail/icons/mail-toolbar-small.png)
   skin/classic/messenger/icons/mail-toolbar.png                  (mail/icons/mail-toolbar.png)
   skin/classic/messenger/icons/message-mail-attach-offl.png      (mail/icons/message-mail-attach-offl.png)
   skin/classic/messenger/icons/message-mail-attach.png           (mail/icons/message-mail-attach.png)
--- a/mail/themes/pinstripe/mail/addrbook/addressbook.css
+++ b/mail/themes/pinstripe/mail/addrbook/addressbook.css
@@ -268,26 +268,38 @@ toolbar[iconsize="small"] #button-abdele
   -moz-appearance: treeheadercell;
   height: 16px;
 }
 
 #dirTree {
   border-right: 1px solid #bebebe;
 }
 
-#dirTree treechildren::-moz-tree-row(odd) {
-  background-color: #FFF;
+#dirTree treechildren::-moz-tree-row {
+  background-color: transparent;
 }
 
 #dirTree treechildren::-moz-tree-row(selected) {
-  background: url("chrome://messenger/skin/icons/foldertree-selected-unfocused.png") #676767 repeat-x !important;
+  background: url("chrome://messenger/skin/icons/sidebar-item.png") 0 0 repeat-x #90A0C0;
 }
 
 #dirTree treechildren::-moz-tree-row(selected, focus) {
-  background: url("chrome://messenger/skin/icons/foldertree-selected-background.png") #225ED0 repeat-x  !important;
+  background-position: 0 -18px;
+}
+
+#dirTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected) {
+  background-position: 0 -36px;
+}
+
+#dirTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected, focus) {
+  background-position: 0 -54px;
+}
+
+:root:not([active]) #dirTree treechildren::-moz-tree-row(selected) {
+  background-position: 0 -72px;
 }
 
 #dirTree treechildren::-moz-tree-cell-text(selected, focus), #dirTree treechildren::-moz-tree-cell-text(selected) {
   color: #FFFFFF;
 }
 
 treechildren::-moz-tree-image(DirCol) {
   -moz-margin-end: 2px;
deleted file mode 100644
index 534d5167fbd737e8643ebeb84bf6827bc68edee2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0b9a92c647b583bb9faf9ae13a2bb9c0daae8a23..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5eefa981278db6db33d8070d793cc85d3a5c2bec
GIT binary patch
literal 1162
zc$@)>1a<p~P)<h;3K|Lk000e1NJLTq000mG003GD1^@s6u`t$a0009!X+uL$Nkc;*
zP;zf(X>4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j
z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G
z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@
z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt
zw<p;_zCm7^4e?-z)50@=sy1qJhT}3$WCgjUXk=x~QL=8QO`AL=?P<>#riT4Se#lwS
z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{<j)?1xjTqpayesq}L_
zu=pA<bG20Zb*ogGxy>A`<C$d?+@h~#Vah8Ys5jWn_{lk1h=ZPdRSR&FbL?LN#4Z5W
zKLQ&b0Lvc(i5j412O{U$ZgAzrDb5Ax$T_E7Gdq;mHtYI!t(`|Jv~JsIZq!nirTH#T
zbA>0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9
zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L
zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q
z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q
zzp3BRzh0>?G*mnz?orbizx<tXWoB88j2qM_<I9?Y_y((Or`JN3)?r>jPhMHy6s|5~
zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKD<a(oy9ht0taW-5H
zYyY#WVA8Uy@Z^n<E<9_Yu2naw-D-=v1Dd)^ZBtv-PQL9__m_9{a#kizvTm2vr`Usy
z)AUwOx-we?{}z5R{4aG0Tezm7$$x0V&1FnW_>SQAA9qOkFZ>Mwg%u5aOFKIN000Sa
zNLh0L01FcU01FcV0GgZ_0002>Nkl<ZSPAXe!3n}Z5CzZ`)|(JC2T{n;Hf+GNjaZ8f
z*omch60IS-8;f`g8zi~!@Mr#?KcB4bkLMKNi<_>4=OM&tA^;)gTns_Z84DCfzy+2T
z3hTgWR2F8?LTe?y($ThYyF*7R1sy3VjVYm!DilB+%m9Jf`V3l79gIn7^dTw&odMH$
zyR6NT`o6aUo{{vlwLh*!Ti~4N2nyQz!a|4@SU^W|1ey;%@2?rk{&=tgo{>^A1Z?X`
zPutkO1xBDVa2B+Mk@JDipt+QFh`bBe^U2nE7zQig8A)~E|B)0yh0BBqg=g>wEi5yr
ck<xG%ev8@p16li{ng9R*07*qoM6N<$f*@xkBme*a
deleted file mode 100644
index 11e747bea715236167f6a935d43bce1518945dfb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/mail/themes/pinstripe/mail/mailWindow1.css
@@ -95,21 +95,33 @@ treechildren::-moz-tree-twisty {
 }
 
 #folderTree treechildren::-moz-tree-row {
   -moz-padding-start: 2px !important;
   background: transparent;
 }
 
 #folderTree treechildren::-moz-tree-row(selected) {
-  background: url("chrome://messenger/skin/icons/tree-selected-overlay.png") #999 repeat-x center center !important;
+  background: url("chrome://messenger/skin/icons/sidebar-item.png") 0 0 repeat-x #90A0C0;
 }
 
 #folderTree treechildren::-moz-tree-row(selected, focus) {
-  background-color: Highlight !important;
+  background-position: 0 -18px;
+}
+
+#folderTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected) {
+  background-position: 0 -36px;
+}
+
+#folderTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected, focus) {
+  background-position: 0 -54px;
+}
+
+:root:not([active]) #folderTree treechildren::-moz-tree-row(selected) {
+  background-position: 0 -72px;
 }
 
 #folderTree treechildren::-moz-tree-cell-text(selected, focus), #folderTree treechildren::-moz-tree-cell-text(selected) {
   color: HighlightText;
 }
 
 treecol,
 treecolpicker {