From c9f12e9633d61b82c71f8a7dd6a57a3b2829106c Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Mon, 26 Nov 2018 01:13:23 +0200
Subject: [PATCH] Update

---
 chrome/navbar_tabs_oneliner.css               |  3 +-
 ...ar_tabs_oneliner_menu_buttons_on_right.css | 38 +++++++++++++++++++
 chrome/toggle_bookmarksbar_with_alt.css       |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 chrome/navbar_tabs_oneliner_menu_buttons_on_right.css

diff --git a/chrome/navbar_tabs_oneliner.css b/chrome/navbar_tabs_oneliner.css
index 871c2f0..4878fbb 100644
--- a/chrome/navbar_tabs_oneliner.css
+++ b/chrome/navbar_tabs_oneliner.css
@@ -6,7 +6,8 @@
 #TabsToolbar{ margin-left: var(--uc-navigationbar-width); }
 #tabbrowser-tabs{ --tab-min-height: var(--uc-toolbar-height) !important; }
 /* This isn't useful when tabs start in the middle of the window */
-.titlebar-placeholder[type="pre-tabs"]{ display: none }
+.titlebar-placeholder[type="pre-tabs"],
+.titlebar-spacer[type="pre-tabs"]{ display: none }
 #nav-bar{margin-right:calc(100vw - var(--uc-navigationbar-width));
   margin-top: calc(0px - var(--uc-toolbar-height))
 }
diff --git a/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
new file mode 100644
index 0000000..34eb93a
--- /dev/null
+++ b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
@@ -0,0 +1,38 @@
+/* Modify these to change relative widths or default hegiht */
+#navigator-toolbox{ --uc-navigationbar-width: 40vw; --uc-toolbar-height: 40px; }
+/* reserved space for overflow + menu buttons */
+#navigator-toolbox{ --uc-buttons-width: calc(56px + 4 * var(--toolbarbutton-outer-padding) + var(--uc-menubutton-padding,6px))}
+#nav-bar:not([overflowing]) > #nav-bar-customization-target{ --uc-buttons-width: calc(28px + 2 * var(--toolbarbutton-outer-padding) + 6px) }
+/* Override for other densities */
+:root[uidensity="compact"] > #navigator-toolbox{ --uc-toolbar-height: 32px; --uc-menubutton-padding: 0px}
+:root[uidensity="touch"] > #navigator-toolbox{ --uc-toolbar-height: 40px; }
+#TabsToolbar{ margin-left: var(--uc-navigationbar-width); }
+#tabbrowser-tabs{ --tab-min-height: var(--uc-toolbar-height) !important; }
+/* This isn't useful when tabs start in the middle of the window */
+.titlebar-placeholder[type="pre-tabs"],.titlebar-spacer[type="pre-tabs"]{ display: none }
+#nav-bar{
+  margin-right:calc(3 * 46px);
+  margin-top: calc(0px - var(--uc-toolbar-height))
+}
+#nav-bar-customization-target{ margin-right: calc(100vw - (var(--uc-navigationbar-width)) - var(--uc-buttons-width) - (3 * 46px)) }
+#TabsToolbar > *{ position: relative !important; z-index: 2 }
+.titlebar-placeholder[type="post-tabs"],
+.titlebar-spacer[type="post-tabs"]{
+  width: var(--uc-buttons-width) !important;
+  -moz-window-dragging: no-drag;
+  pointer-events:none;
+}
+#PanelUI-button,#nav-bar-overflow-button{
+  margin: 0px !important;
+  border: 0px !important;
+  position: relative;
+  z-index: 3;
+}
+/* 1px margin on touch density causes tabs to be too high */
+.tab-close-button{ margin-top: 0 }
+/* prevent urlbar overflow on narrow windows */
+@media screen and (max-width: 1300px){
+  #urlbar-container{ min-width:unset !important }
+}
+/* Hide dropdown placeholder */
+#urlbar-container:not(:hover) .urlbar-history-dropmarker{margin-inline-start: -28px;}
\ No newline at end of file
diff --git a/chrome/toggle_bookmarksbar_with_alt.css b/chrome/toggle_bookmarksbar_with_alt.css
index 3af7f49..833850d 100644
--- a/chrome/toggle_bookmarksbar_with_alt.css
+++ b/chrome/toggle_bookmarksbar_with_alt.css
@@ -1,5 +1,6 @@
 /* Pretty much requires either menubar_in-toolbar or the oneliner compatible one */
 /* Otherwise the changing vertical position causes bookmarks to be unclickable */
+/* NOT COMPATIBLE with Fx65+ */
 #main-window[sizemode="normal"]:not([customizing]) #PersonalToolbar{
   transition: margin 0.15s ease-in-out 50ms, z-index 16ms linear 100ms!important;
   height: 28px;