try to get mac-specific rules in places for toolbars

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 8d384a7772c03b66ca3b78ce60d93c79f4ffecb4..98f50ad4860d994053af8bda0d97a960bdc4025c 100644 (file)
--- 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 9a2a18f6d294a7650006e0004f99f78ab0352605..343d5ed298533a6fb832ff31532d4b672304a189 100644 (file)
--- 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 (file)
index 2c53f23..0000000
--- 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 (file)
index e69de29..0000000

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 49fd787e0f99d35a54dde65d9461eb7a3d8dab5f..97eccb7ac4c478411384fe960cb7dd3317301232 100644 (file)
--- 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,