Combine window placeholder support sheets

chrome/Fx65_tabs_on_bottom.css

@@ -1,24 +1,18 @@
 /* Modify to change window drag space width */
 /*
-Use Fx65_tabs_on_bottom_menubar_on_top_patch if you
+Use Fx65_tabs_on_bottom_menubar_on_top_patch.css if you
 have menubar permanently enabled and want it on top
  */
 
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 :root{
   --uc-titlebar-padding: 0px; }
 :root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
-:root[tabsintitlebar="true"] #nav-bar{ --window-drag-space-width: 24px; }
 
 .titlebar-buttonbox-container{
   position: fixed;

chrome/hide_tabs_toolbar.css

@@ -2,13 +2,8 @@
 
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 :root{ --uc-toolbar-height: 32px; }

chrome/hide_tabs_with_one_tab.css

@@ -1,6 +1,7 @@
 /* Makes tabs toolbar items zero-height initially and sets enlarge them to fill up space equal to tab-min-height set on tabs */
 /* Firefox 65+ only */
-/* !!USER!! -  REMOVE ALL BUTTONS you can from the tabs toolbar */
+
+/* REMOVE ALL BUTTONS you can from the tabs toolbar or this won't work properly */
 
 :root[sizemode="normal"] #nav-bar{ --uc-window-drag-space-width: 20px }
 

chrome/hide_tabs_with_one_tab_w_window_controls.css

@@ -4,13 +4,8 @@
 
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 #titlebar{ -moz-appearance: none !important; }

chrome/navbar_tabs_oneliner.css

@@ -1,5 +1,12 @@
 /*Make tabs and navbar appear side-by-side tabs on right */
 
+/* IMPORTANT */
+/*
+Get window_control_placeholder_support.css
+Window controls will be all wrong without it
+*/
+
+
 /* Modify these to change relative widths or default height */
 #navigator-toolbox{
 	--uc-navigationbar-width: 40vw;

chrome/navbar_tabs_oneliner_menu_buttons_on_right.css

@@ -2,13 +2,8 @@
 
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 /* Modify these to change relative widths or default height */
@@ -45,7 +40,7 @@ Window controls will be all wrong without it
   #nav-bar-customization-target{ margin-right: calc(100vw - (var(--uc-navigationbar-width)) - var(--uc-buttons-width) - var(--uc-window-drag-space-width)) }
 }
 
-#TabsToolbar > :not(hbox){ position: relative !important; z-index: 2 }
+#TabsToolbar > .toolbar-items{ position: relative !important; z-index: 2 }
 .titlebar-placeholder[type="post-tabs"],
 .titlebar-spacer[type="post-tabs"]{
   width: calc(var(--uc-buttons-width) + var(--uc-window-drag-space-width)) !important;

chrome/navbar_tabs_oneliner_tabs_on_left.css

@@ -2,13 +2,8 @@
 
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 /* Modify these to change relative widths or default height */
@@ -17,7 +12,7 @@ Window controls will be all wrong without it
   --uc-toolbar-height: 40px;
 }
 /* Override for other densities */
-:root[uidensity="compact"] > #navigator-toolbox{ --uc-toolbar-height: 31px;}
+:root[uidensity="compact"] > #navigator-toolbox{ --uc-toolbar-height: 32px;}
 :root[uidensity="touch"] > #navigator-toolbox{ --uc-toolbar-height: 40px; }
 
 /* prevent urlbar overflow on narrow windows */
@@ -27,7 +22,7 @@ Window controls will be all wrong without it
 }
 
 #toolbar-menubar{ height: initial !important; }
-#toolbar-menubar[inactive] > #menubar-items{ opacity: 0; pointer-events: none; }
+#toolbar-menubar[inactive] > :not(.titlebar-buttonbox-container){ opacity: 0; pointer-events: none; }
 #toolbar-menubar[inactive]{ margin-bottom: calc(0px - var(--uc-toolbar-height)) }
 
 #TabsToolbar > .titlebar-buttonbox-container,

chrome/tabs_below_content.css

@@ -1,12 +1,8 @@
+
 /* IMPORTANT */
 /*
-Get EITHER
+Get window_control_placeholder_support.css
-window_control_placeholder_support.css
-OR
-window_control_placeholder_support_mac.css
-
 Window controls will be all wrong without it
-
 */
 
 .titlebar-buttonbox-container{

chrome/window_control_placeholder_support.css

@@ -1,7 +1,7 @@
 /* Creates placeholders for window controls */
-/* For window controls on RIGHT side of the window */
 /* This is a supporting file used by other stylesheets */
 
+/* Defaults for window controls on RIGHT side of the window */
 :root{
   --uc-window-control-width: 138px;
   --uc-window-drag-space-width: 24px;
@@ -9,5 +9,15 @@
 
 :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
   padding-right: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-width,0px));
-  padding-left: var(--window-drag-space-width);
+  padding-left: var(--uc-window-drag-space-width);
+}
+
+/* Use this pref to check Mac OS where window controls are on left */
+/* This pref defaults to true on Mac and doesn't actually do anything on other platforms. So if your system has window controls on LEFT side you can set the pref to true */
+@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled"){
+	:root{ --uc-window-control-width: 72px; }
+  :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-left: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-width,0px));
+  padding-right: var(--uc-window-drag-space-width);
+  }
 }

chrome/window_control_placeholder_support_mac.css

@@ -1,13 +0,0 @@
-/* Creates placeholders for window controls */
-/* For window controls on LEFT side of the window */
-/* This is a supporting file used by other stylesheets */
-
-:root{
-  --uc-window-control-width: 72px;
-  --uc-window-drag-space-width: 24px;
-}
-
-:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
-  padding-left: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-width,0px));
-  padding-right: var(--window-drag-space-width);
-}