apply actually working rules to cover most of mac (except non-graphite 10.6) until...

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 482251308704659e05a3ef431a899292607f87d8..ab4d54d213c1a10fc48b1746d8c37a4a94688336 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -17,8 +17,8 @@ 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 X. */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme), (-moz-mac-yosemite-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   toolbar[customizable="true"]:not([nowindowdrag="true"]) {
     -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
   }
@@ -74,15 +74,15 @@ menubar {
 /*  margin-top: 15px;*/
 }
 
-@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* This is a usable workaround to detect we're not on Mac OS X. */
+@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
+  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
   #toolbar-menubar:not([autohide="true"]) {
     -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
   }
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* This is a usable workaround to detect we're on Mac OS X. */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar {
     padding-left: 60px;
   }
@@ -113,9 +113,9 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* This is a usable workaround to detect we're not on Mac OS X. */
-  /* indent also due to non-applicable aero rule */
+@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
+  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
+  /* Indent also due to non-applicable aero rule in original Windows theme. */
   #toolbar-menubar {
     background-color: transparent !important;
   }
@@ -151,8 +151,8 @@ menubar {
   }
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* This is a usable workaround to detect we're on Mac OS X. */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #titlebar-buttonbox > .titlebar-button {
     display: none;
   }
@@ -196,8 +196,8 @@ menubar {
   margin-top: 4px;
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* This is a usable workaround to detect we're on Mac OS X. */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #main-window[sizemode="normal"] > #titlebar,
   #main-window[sizemode="maximized"] > #titlebar {
     margin-top: 19px;
@@ -261,8 +261,8 @@ menubar {
   list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* This is a usable workaround to detect we're on Mac OS X. */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #titlebar-fullscreen-button {
     -moz-appearance: none;
     list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon.png");

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 537e261bb7c01889c2965eb706b08fc6567c44cb..6cf895d0e86e84e2f9ac6e4567f5e4b8bdc810d5 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -48,7 +48,7 @@ toolbaritem > menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
 
-@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme), (-moz-mac-yosemite-theme) {
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
   /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   toolbar.chromeclass-menubar {
     -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
@@ -56,15 +56,6 @@ toolbaritem > menubar {
   }
 }
 
-/* HACK TEST ONLY: try several mac supports rules! */
-
-@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) and (-moz-mac-yosemite-theme: 0) {
-  /* this is a usable workaround to detect we're on Mac OS */
-  toolbox {
-    border: 1px solid blue !important;
-  }
-}
-
 /* ::::: root elements ::::: */
 
 window,