From 998f41da6bc1ff07c6478a763bf23b24a9abcef0 Mon Sep 17 00:00:00 2001
From: "stefanh%inbox.com"
 <stefanh%inbox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 20 May 2007 19:34:13 +0000
Subject: [PATCH] Bug 379985 - [Pinstripe] Use Highlight and highlighttext
 where applicable. r=mano (toolkit), r=bienvenu (mail).

git-svn-id: svn://10.0.0.236/trunk@226678 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../themes/pinstripe/mail/mailWindow1.css     |  4 ++--
 .../themes/pinstripe/global/autocomplete.css  |  4 ++--
 .../themes/pinstripe/global/listbox.css       |  4 ++--
 .../toolkit/themes/pinstripe/global/tree.css  | 20 +++++++++----------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/mozilla/mail/themes/pinstripe/mail/mailWindow1.css b/mozilla/mail/themes/pinstripe/mail/mailWindow1.css
index 3307e428dfe..2fd00b1d0b5 100644
--- a/mozilla/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/mozilla/mail/themes/pinstripe/mail/mailWindow1.css
@@ -104,11 +104,11 @@ treechildren::-moz-tree-twisty {
 }
 
 #folderTree treechildren::-moz-tree-row(selected, focus) {
-  background-color: -moz-mac-alternateprimaryhighlight !important;
+  background-color: Highlight !important;
 }
 
 #folderTree treechildren::-moz-tree-cell-text(selected, focus), #folderTree treechildren::-moz-tree-cell-text(selected) {
-  color: #FFFFFF;
+  color: HighlightText;
 }
 
 treecol,
diff --git a/mozilla/toolkit/themes/pinstripe/global/autocomplete.css b/mozilla/toolkit/themes/pinstripe/global/autocomplete.css
index f39cd5a004d..6dd9776cf3b 100644
--- a/mozilla/toolkit/themes/pinstripe/global/autocomplete.css
+++ b/mozilla/toolkit/themes/pinstripe/global/autocomplete.css
@@ -108,11 +108,11 @@ popup[type="autocomplete"],
 }
 
 treechildren.autocomplete-treebody::-moz-tree-row(selected) {
- background-color: -moz-mac-alternateprimaryhighlight;
+ background-color: Highlight;
 }
 
 treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
-  color: #FFFFFF !important;
+  color: HighlightText !important;
 }
 
 /* ::::: textboxes inside toolbarpaletteitems ::::: */
diff --git a/mozilla/toolkit/themes/pinstripe/global/listbox.css b/mozilla/toolkit/themes/pinstripe/global/listbox.css
index d9a790de2c8..5d39be9c575 100644
--- a/mozilla/toolkit/themes/pinstripe/global/listbox.css
+++ b/mozilla/toolkit/themes/pinstripe/global/listbox.css
@@ -76,8 +76,8 @@ listitem[selected="true"] {
 }
 
 listbox:focus > listitem[selected="true"] {  
-   background-color: -moz-mac-alternateprimaryhighlight;
-   color: #FFFFFF;
+   background-color: Highlight;
+   color: HighlightText;
 }
 
 /* ::::: listheader ::::: */
diff --git a/mozilla/toolkit/themes/pinstripe/global/tree.css b/mozilla/toolkit/themes/pinstripe/global/tree.css
index 45e07cb90d1..05d234ade0c 100644
--- a/mozilla/toolkit/themes/pinstripe/global/tree.css
+++ b/mozilla/toolkit/themes/pinstripe/global/tree.css
@@ -87,9 +87,8 @@ tree:not([hidecolumnpicker="true"]) treechildren::-moz-tree-row(odd, selected) {
 treechildren::-moz-tree-row(selected, focus), 
 treechildren::-moz-tree-row(odd, selected, focus),
 tree:not([hidecolumnpicker="true"]) treechildren::-moz-tree-row(odd, selected, focus) {
-  /* background-color: Highlight; */
-  background-color: -moz-mac-alternateprimaryhighlight;
-  color: #FFFFFF;
+  background-color: Highlight;
+  color: HighlightText;
 }
 
 tree[seltype="cell"] > treechildren::-moz-tree-row,
@@ -136,20 +135,19 @@ tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) {
 }
 
 treechildren::-moz-tree-cell-text(selected, focus) {
-  /* color: HighlightText; */
-  color: #FFFFFF;
+  color: HighlightText;
 }
 
 tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) {
-  background-color: -moz-mac-alternateprimaryhighlight;
+  background-color: Highlight;
 }
 tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
-  color: #FFFFFF;
+  color: HighlightText;
 }
 
 tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
-  background-color: -moz-mac-alternateprimaryhighlight;
-  color: #FFFFFF;
+  background-color: Highlight;
+  color: HighlightText;
 }
 
 /* ::::: lines connecting cells ::::: */
@@ -383,11 +381,11 @@ treechildren[alternatingbackground="true"]::-moz-tree-cell-text(odd, selected) {
 }
 
 treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected, focus) {
-  background-color: -moz-mac-alternateprimaryhighlight;
+  background-color: Highlight;
 }
 
 treechildren[alternatingbackground="true"]::-moz-tree-cell-text(odd, selected, focus) {
-  color: #FFFFFF;
+  color: HighlightText;
 }
 
 /* ::::: editable tree ::::: */