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

[themes.git] / LCARStrek / browser / browser.css

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 617944a485b3e7d76eae541e9f28ff41cced6940..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 */
+@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,13 +74,20 @@ menubar {
 /*  margin-top: 15px;*/
 }
 
-@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@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");
   }
 }
 
+@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;
+  }
+}
+
 #main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
   /* the titlebar buttons are shown right over the endcap but we have no power over the buttonbox position just for this case, so hide the endcap */
   display: none;
@@ -106,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 */
-  /* 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;
   }
@@ -144,14 +151,11 @@ menubar {
   }
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@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;
   }
-  #titlebar-buttonbox {
-    margin-top: 1px;
-  }
 }
 
 #nav-bar {
@@ -192,6 +196,15 @@ menubar {
   margin-top: 4px;
 }
 
+@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;
+    /* There is a margin-bottom set to -23 by code. */
+  }
+}
+
 /* The button box must appear on top of the navigator-toolbox in order for
  * click and hover mouse events to work properly for the button in the restored
  * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
@@ -248,6 +261,31 @@ menubar {
   list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
+@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");
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+  }
+
+  #titlebar-fullscreen-button:hover {
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
+  }
+
+  @media (min-resolution: 2dppx) {
+    #titlebar-fullscreen-button {
+      list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon@2x.png");
+      -moz-image-region: rect(0px, 32px, 32px, 0px);
+    }
+
+    #titlebar-fullscreen-button:hover {
+      -moz-image-region: rect(0px, 64px, 32px, 32px);
+    }
+  }
+}
+
+
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item:not(.subviewbutton),