From 8351446c22bd414eca91fb20a64cb5dffd8ab689 Mon Sep 17 00:00:00 2001
From: aleth <aleth@instantbird.org>
Date: Fri, 26 Feb 2016 18:58:01 +0100
Subject: [PATCH] Bug 1251724 - Add contact list header CSS for OS X >= 10.10.
 r=nhnt11

--HG--
extra : rebase_source : 6ce8672a93343ba499a4f6b3026023d1efcb37db
extra : amend_source : 25e1b8903a022b75206d6139c81582e36d16b74f
---
 im/themes/blist.css | 66 ++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/im/themes/blist.css b/im/themes/blist.css
index 9922674052..6fe70e4168 100644
--- a/im/themes/blist.css
+++ b/im/themes/blist.css
@@ -18,54 +18,70 @@ richlistbox {
   -moz-appearance: none;
 }
 
+
 .listboxHeader {
   margin: 0 0;
   padding: 2px 5px;
-  border-style: none;
-  -moz-appearance: none;
-%ifdef XP_MACOSX
-  background-color: -moz-mac-chrome-active;
-  background-image: -moz-linear-gradient(rgba(255,255,255,.43), rgba(255,255,255,0));
-  border-bottom: 1px solid rgba(0, 0, 0, 0.57);
 }
 
-.listboxHeader:-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-  border-bottom-color: rgba(0, 0, 0, 0.32);
-%else
+%ifdef XP_MACOSX
+@media not all and (-moz-mac-yosemite-theme) {
+  .listboxHeader {
+    border-style: none;
+    -moz-appearance: none;
+    background-color: -moz-mac-chrome-active;
+    background-image: -moz-linear-gradient(rgba(255,255,255,.43), rgba(255,255,255,0));
+    border-bottom: 1px solid rgba(0, 0, 0, 0.57);
+  }
+
+  .listboxHeader:-moz-window-inactive {
+    background-color: -moz-mac-chrome-inactive;
+    border-bottom-color: rgba(0, 0, 0, 0.32);
+  }
+
+  #contactsHeader {
+    border-top: 1px solid rgb(66, 66, 66);
+  }
+
+  #contactsHeader:-moz-window-inactive {
+    border-top-color: rgb(137, 137, 137);
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  .listboxHeader {
+    -moz-appearance: toolbar;
+  }
+}
+%endif
+%ifndef XP_MACOSX
+.listboxHeader {
+  border-style: none;
+  -moz-appearance: none;
   background-color: -moz-Dialog;
 %ifdef XP_WIN
   background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0));
 %else
   background-image: -moz-linear-gradient(rgba(255,255,255,.3), rgba(255,255,255,0));
 %endif
-%endif
 }
 
+%ifdef XP_WIN
 #contactsHeader {
-%ifdef XP_MACOSX
-  border-top: 1px solid rgb(66, 66, 66);
-}
-
-#contactsHeader:-moz-window-inactive {
-  border-top-color: rgb(137, 137, 137);
-%else
-%ifdef XP_UNIX
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-%else
   border-top: none;
-%endif
-%endif
+}
+%else
+#contactsHeader {
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
 }
 
-%ifdef XP_UNIX
-%ifndef XP_MACOSX
 #convsHeader {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
 %endif
 %endif
 
+
 .convUnreadCount,
 .convUnreadTargetedCount {
   font-weight: bold;