try even more mac-specific toolbar adjustments

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 617944a485b3e7d76eae541e9f28ff41cced6940..2c0adee851b7ad607a437b27ca5f7366ddacf082 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -75,10 +75,13 @@ menubar {
 }
 
 @supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+  /* this is a usable workaround to detect we're not on Mac OS */
   #toolbar-menubar:not([autohide="true"]) {
     -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
   }
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar {
+    padding-left: 60px;
+  }
 }
 
 #main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
@@ -149,9 +152,6 @@ menubar {
   #titlebar-buttonbox > .titlebar-button {
     display: none;
   }
-  #titlebar-buttonbox {
-    margin-top: 1px;
-  }
 }
 
 #nav-bar {
@@ -192,6 +192,14 @@ menubar {
   margin-top: 4px;
 }
 
+@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
+  /* this is a usable workaround to detect we're on Mac OS */
+  #main-window[sizemode="normal"] > #titlebar {
+    margin-top: 4px;
+    margin-bottom: 0;
+  }
+}
+
 /* 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 +256,31 @@ 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 */
+  #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),