3 files changed, 31 insertions, 47 deletions

diff --git a/.mozilla/firefox/hibiki.default/chrome/user.sidebar.css b/.mozilla/firefox/hibiki.default/chrome/user.sidebar.css
index e286126..4b76246 100644
--- a/.mozilla/firefox/hibiki.default/chrome/user.sidebar.css
+++ b/.mozilla/firefox/hibiki.default/chrome/user.sidebar.css
@@ -28,14 +28,15 @@
 	min-width: var(--thin-tab-width) !important;
 	max-width: var(--thin-tab-width) !important;
 	overflow-x: hidden !important;
-	/*animate transition*/
-	/*transition: all 40ms !important;*/
+	/* animate transition */
+	transition: all 40ms !important;
 }
 
 #sidebar-box:not([hidden]):hover,
 #sidebar-box:not([hidden]):active,
 #sidebar-box:not([hidden]):focus-within,
-#sidebar-box:not([hidden]):-moz-drag-over {
+#sidebar-box:not([hidden]):-moz-drag-over,
+#sidebar-box:not([hidden])>.Tab[selected="true"] {
 	min-width: var(--wide-tab-width) !important;
 	max-width: var(--wide-tab-width) !important;
 }
diff --git a/.mozilla/firefox/hibiki.default/chrome/user.urlbar.css b/.mozilla/firefox/hibiki.default/chrome/user.urlbar.css
index 158c59b..2a5297c 100644
--- a/.mozilla/firefox/hibiki.default/chrome/user.urlbar.css
+++ b/.mozilla/firefox/hibiki.default/chrome/user.urlbar.css
@@ -2,59 +2,27 @@
 
 #urlbar-container {
 	--urlbar-container-height: 29px !important;
-	--urlbar-container-padding: 0px !important;
-}
-
-#urlbar {
-	--urlbar-height: var(--urlbar-container-height) !important;
-	--urlbar-toolbar-height: var(--urlbar-container-height) !important;
+	--urlbar-container-padding: 0 !important;
+	--urlbar-padding-block: 0 !important;
+	--urlbar-margin-inline: 0 !important;
 }
 
 #urlbar-background {
-	border: none !important;
-}
-
-#urlbar:not([focused="true"])>#urlbar-background {
 	background-color: var(--toolbar-bgcolor) !important;
 }
 
-#urlbar-input-container {
-	padding-right: 5px !important;
-	border: none !important;
-}
-
-#urlbar-results,
-.urlbarView-row {
-	padding-top: 0px !important;
-	padding-bottom: 0px !important;
-}
-
-.search-one-offs {
-	padding-block: 0px !important;
+#urlbar[breakout][breakout-extend] {
+	width: var(--urlbar-width) !important;
 }
 
-.search-panel-one-offs {
-	padding-left: 7px !important;
+#urlbar[breakout][breakout-extend]>.urlbar-input-container {
+	padding-block: var(--urlbar-padding-block) !important;
+	padding-inline: var(--urlbar-padding-block) !important;
 }
 
-.searchbar-engine-one-off-item {
-	margin: 0px !important;
-}
-
-/* make sure the lock icon aligns with the collapsed sidebar */
-#urlbar-container {
-	padding-block: 0 !important;
-	margin-left: 0 !important;
-}
-
-#tracking-protection-icon-container {
-	padding: 0 6px !important;
-}
-
-#identity-box {
-	margin-inline-start: var(--identity-box-margin-inline);
-}
+#urlbar-results {
+	--urlbarView-results-padding: 2px !important;
 
-#tracking-protection-icon-container {
-	padding-left: 8px !important;
+	padding-top: 0 !important;
+	border-top: none !important;
 }
diff --git a/.mozilla/firefox/hibiki.default/chrome/userChrome.css b/.mozilla/firefox/hibiki.default/chrome/userChrome.css
index ef1a5d2..6d2d27c 100644
--- a/.mozilla/firefox/hibiki.default/chrome/userChrome.css
+++ b/.mozilla/firefox/hibiki.default/chrome/userChrome.css
@@ -43,6 +43,11 @@
     display: none !important;
 }
 
+.titlebar-spacer[type="pre-tabs"],
+.titlebar-spacer[type="post-tabs"] {
+    width: 0 !important;
+}
+
 /* = RADIUS STUFF ========================================================== */
 
 /* Makes urlbar and many other things sharper on the edges */
@@ -90,3 +95,13 @@ statuspanel {
     /*removes thin space at the top of window*/
     border-top: none !important;
 }
+
+/*spacer cannot be removed via customize, do this instead*/
+#nav-bar toolbarspring {
+    min-width: 0 !important;
+    flex-grow: 0 !important;
+}
+
+.titlebar-spacer {
+    width: 0 !important;
+}