try more mac-specific toolbar adjustments

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

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f37015b08227198a3360f7ce5b7cf85f370836e1..617944a485b3e7d76eae541e9f28ff41cced6940 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");
 }
@@ -67,8 +74,11 @@ menubar {
 /*  margin-top: 15px;*/
 }
 
-#toolbar-menubar:not([autohide="true"]) {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
+  /* this is a usable workaround to detect we're on Mac OS */
+  #toolbar-menubar:not([autohide="true"]) {
+    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+  }
 }
 
 #main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
@@ -96,7 +106,9 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-/* indent due to non-applicable aero rule */
+@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 */
   #toolbar-menubar {
     background-color: transparent !important;
   }
@@ -114,6 +126,10 @@ menubar {
     color: #FF9F00;
   }
 
+  #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+    /*color: inherit;*/
+  }
+
   #TabsToolbar:-moz-lwtheme {
     /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
   }
@@ -126,6 +142,17 @@ menubar {
     -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
     visibility: visible;
   }
+}
+
+@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
+  /* this is a usable workaround to detect we're on Mac OS */
+  #titlebar-buttonbox > .titlebar-button {
+    display: none;
+  }
+  #titlebar-buttonbox {
+    margin-top: 1px;
+  }
+}
 
 #nav-bar {
   /* Position the toolbar above the bottom of background tabs */
@@ -1653,8 +1680,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar {
-  -moz-border-start: none;
-/*  margin-left: 0;*/
+/*  -moz-border-start: none;
+  margin-left: 0;*/
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {