From cb4ebed3565e81bc518a3685c8db7fd01b82ddd5 Mon Sep 17 00:00:00 2001
From: bmFtZQ <62812711+bmFtZQ@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:47:03 +0800
Subject: [PATCH] fix various layout issues ff 113+ #88

---
 chrome/global/popup.css   | 6 ++++--
 chrome/global/tweaks.css  | 5 +++--
 chrome/toolbar/navbar.css | 1 +
 chrome/toolbar/tabbar.css | 2 +-
 chrome/toolbar/urlbar.css | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/global/popup.css b/chrome/global/popup.css
index e0a3b04..6b8f31d 100644
--- a/chrome/global/popup.css
+++ b/chrome/global/popup.css
@@ -73,7 +73,7 @@
 /* firefox profile avatar in appmenu */
 #appMenu-fxa-label2::before {
   content: "";
-  display: -moz-box;
+  display: flex;
   height: 16px;
   width: 16px;
   background: var(--avatar-image-url) 0/16px;
@@ -311,6 +311,7 @@
 }
 
 #PopupAutoComplete .autocomplete-richlistitem[originaltype="loginsFooter"] {
+  justify-content: start !important;
   -moz-box-pack: start !important;
   color: inherit !important;
   background-color: transparent !important;
@@ -571,7 +572,7 @@ panelview .toolbarbutton-1,
   }
 
   menuitem:is([type="checkbox"], [checked="true"], [type="radio"])>.menu-iconic-left>.menu-iconic-icon {
-    display: -moz-box !important;
+    display: flex !important;
   }
 
   menuitem[checked="true"]>.menu-iconic-left,
@@ -597,6 +598,7 @@ panelview .toolbarbutton-1,
   }
 
   #context-navigation>.menuitem-iconic {
+    justify-content: center !important;
     -moz-box-pack: center !important;
   }
 
diff --git a/chrome/global/tweaks.css b/chrome/global/tweaks.css
index 212a37a..233f7c5 100644
--- a/chrome/global/tweaks.css
+++ b/chrome/global/tweaks.css
@@ -217,11 +217,12 @@ bugs with certain themes eg. dark text on dark background.) */
       }
 
       #context-navigation>.menuitem-iconic {
+        justify-content: start !important;
         -moz-box-pack: start !important;
       }
 
       #context-navigation .menu-iconic-text {
-        display: -moz-box !important;
+        display: flex !important;
       }
 
       :root,
@@ -280,6 +281,6 @@ bugs with certain themes eg. dark text on dark background.) */
 
 @supports -moz-bool-pref("uc.tweak.show-tab-close-button-on-hover") {
   #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned], [selected]):hover .tab-close-button {
-    display: -moz-box !important;
+    display: flex !important;
   }
 }
diff --git a/chrome/toolbar/navbar.css b/chrome/toolbar/navbar.css
index b8d76f3..cbf2e7f 100644
--- a/chrome/toolbar/navbar.css
+++ b/chrome/toolbar/navbar.css
@@ -41,6 +41,7 @@
 }
 
 #fxa-toolbar-menu-button {
+  display: flex !important;
   display: -moz-box !important;
 }
 
diff --git a/chrome/toolbar/tabbar.css b/chrome/toolbar/tabbar.css
index d91890b..92abd56 100644
--- a/chrome/toolbar/tabbar.css
+++ b/chrome/toolbar/tabbar.css
@@ -273,7 +273,7 @@
 }
 
 .titlebar-spacer[type="post-tabs"] {
-  display: -moz-box !important;
+  display: flex !important;
 }
 
 .titlebar-spacer[type="pre-tabs"],
diff --git a/chrome/toolbar/urlbar.css b/chrome/toolbar/urlbar.css
index 85bc718..2ad44de 100644
--- a/chrome/toolbar/urlbar.css
+++ b/chrome/toolbar/urlbar.css
@@ -123,6 +123,7 @@
 #tracking-protection-icon-container,
 #page-action-buttons {
   -moz-box-ordinal-group: 2 !important;
+  order: 2 !important;
 }
 
 #urlbar-container:not(:hover) #tracking-protection-icon-container:not([open]) {