From 96b206febe5aaa2fc76ffa3088e4fdb0ef570fc7 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Thu, 21 Aug 2014 22:54:13 +0200
Subject: [PATCH] try to get mac-specific rules in places for toolbars

---
 LCARStrek/browser/browser.css            | 12 +++++++-----
 LCARStrek/chrome.manifest                |  2 --
 LCARStrek/global/global-platform-mac.css |  4 ----
 LCARStrek/global/global-platform.css     |  0
 LCARStrek/global/global.css              |  9 ++++++++-
 5 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 LCARStrek/global/global-platform-mac.css
 delete mode 100644 LCARStrek/global/global-platform.css

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 8d384a77..98f50ad4 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -17,6 +17,13 @@ toolbar[customizable="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-browsercustom");
 }
 
+@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
+  /* this is a usable workaround to detect we're on Mac OS */
+  toolbar[customizable="true"]:not([nowindowdrag="true"]) {
+    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+  }
+}
+
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide");
 }
@@ -96,11 +103,6 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-@supports ( -moz-appearance:-moz-mac-unified-toolbar ){
-  #navigator-toolbox {
-    background-color: rebeccapurple;
-  }
-}
 /* indent due to non-applicable aero rule */
   #toolbar-menubar {
     background-color: transparent !important;
diff --git a/LCARStrek/chrome.manifest b/LCARStrek/chrome.manifest
index 9a2a18f6..343d5ed2 100644
--- a/LCARStrek/chrome.manifest
+++ b/LCARStrek/chrome.manifest
@@ -1,6 +1,4 @@
 skin global LCARStrek global/
-#apparently, override is not allowed in a skin manifest :(
-#override chrome://global/content/global-platform.css chrome://global/content/global-platform-mac.css os=Darwin
 skin mozapps LCARStrek mozapps/
 skin messenger LCARStrek messenger/
 skin messenger-newsblog LCARStrek messenger-newsblog/
diff --git a/LCARStrek/global/global-platform-mac.css b/LCARStrek/global/global-platform-mac.css
deleted file mode 100644
index 2c53f234..00000000
--- a/LCARStrek/global/global-platform-mac.css
+++ /dev/null
@@ -1,4 +0,0 @@
-toolbar.chromeclass-menubar {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-  border-bottom: none;
-}
diff --git a/LCARStrek/global/global-platform.css b/LCARStrek/global/global-platform.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 49fd787e..97eccb7a 100644
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -8,7 +8,6 @@
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
-@import url("chrome://global/content/global-platform.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -49,6 +48,14 @@ toolbaritem > menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
 
+@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
+  /* this is a usable workaround to detect we're on Mac OS */
+  toolbar.chromeclass-menubar {
+    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
+    border-bottom: none;
+  }
+}
+
 /* ::::: root elements ::::: */
 
 window,
-- 
2.35.3