From 64259017f8ca55b17af229ba9cad724c557fdb5d Mon Sep 17 00:00:00 2001
From: Andreas Nilsson <nisses.mail@home.se>
Date: Mon, 4 Jun 2012 11:03:28 +0200
Subject: [PATCH] Bug 756136 - not possible to see if the left pane of the Chat
 tab has focus if "Conversations" is selected on Windows/Linux, r=mconley.

---
 mail/themes/gnomestripe/mail/chat.css | 13 +++++++++++--
 mail/themes/qute/mail/chat-aero.css   | 15 +++++++++------
 mail/themes/qute/mail/chat.css        | 12 ++++++++++--
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/mail/themes/gnomestripe/mail/chat.css b/mail/themes/gnomestripe/mail/chat.css
index 8788ea64be..f57c4f7e01 100644
--- a/mail/themes/gnomestripe/mail/chat.css
+++ b/mail/themes/gnomestripe/mail/chat.css
@@ -48,10 +48,19 @@ imcontact {
   -moz-padding-end: 2px;
 }
 
-imconv[selected],
-imcontact[selected] {
+:-moz-any(imconv, imcontact, imgroup) {
+  border: 1px solid transparent;
+}
+
+:-moz-any(imconv, imcontact, imgroup)[selected] {
+  background-color: -moz-cellhighlight;
+  color: -moz-cellhighlighttext;
+}
+
+#contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
   background-color: Highlight;
   color: HighlightText;
+  border: 1px dotted #F3D982;
 }
 
 .conv-hbox {
diff --git a/mail/themes/qute/mail/chat-aero.css b/mail/themes/qute/mail/chat-aero.css
index 51258a3db4..3809637764 100644
--- a/mail/themes/qute/mail/chat-aero.css
+++ b/mail/themes/qute/mail/chat-aero.css
@@ -93,6 +93,7 @@
     background-color: rgb(233,239,245);
   }
 
+  imgroup,
   imconv,
   imcontact {
     min-height: 1.7em;
@@ -102,10 +103,8 @@
     background-color: transparent;
   }
 
-  imconv[selected],
-  imcontact[selected],
-  imconv:hover,
-  imcontact:hover {
+  :-moz-any(imconv, imcontact, imgroup)[selected],
+  :-moz-any(imconv, imcontact, imgroup):hover {
     border: 1px solid Highlight;
     background-image: -moz-linear-gradient(rgba(255,255,255,.98), rgba(255,255,255,.82));
     background-repeat: no-repeat;
@@ -117,11 +116,15 @@
     -moz-border-bottom-colors: Highlight rgba(255,255,255,.6);
   }
 
-  imconv[selected][current],
-  imcontact[selected][current] {
+  :-moz-any(imconv, imcontact, imgroup)[selected][current] {
     background-image: -moz-linear-gradient(rgba(255,255,255,.85), rgba(255,255,255,.6));
   }
 
+  #contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
+    background-image: -moz-linear-gradient(rgba(255,255,255,.85), rgba(255,255,255,.6));
+    border: 1px solid Highlight;
+  }
+
   .listitem-iconic[selected] > .listcell-iconic > .listcell-label,
   #nicklist:focus > .listitem-iconic[inactive][selected] > .listcell-iconic > .listcell-label {
     color: -moz-dialogtext !important;
diff --git a/mail/themes/qute/mail/chat.css b/mail/themes/qute/mail/chat.css
index 7eeea2c685..1ca324ed82 100644
--- a/mail/themes/qute/mail/chat.css
+++ b/mail/themes/qute/mail/chat.css
@@ -106,10 +106,18 @@
   background-color: -moz-Dialog;
 }
 
-imconv[selected],
-imcontact[selected] {
+:-moz-any(imconv, imcontact, imgroup) {
+  border: 1px solid transparent;
+}
+
+:-moz-any(imconv, imcontact, imgroup)[selected] {
+  background-color: -moz-cellhighlight;
+}
+
+#contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
   background-color: Highlight;
   color: HighlightText;
+  border: 1px dotted #F3D982;
 }
 
 #button-add-buddy {