From e75f35aab12005d0419bd4f2b01826ece7d98b72 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 12 Jan 2025 01:40:06 -0500
Subject: [PATCH] feat(firefox-gx): update to v0.9.9 and fix custom css

---
 flake.lock                                    | Bin 57580 -> 57580 bytes
 flake.nix                                     | Bin 12197 -> 12197 bytes
 .../firefox/custom-css/style.scss             |  28 +++++++++++-------
 inputs/default.nix                            |   2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index f02040046c0389800704d583f442a7a5a1b66f9a..a86c9497d648ad5aedd6071979873eb72e650105 100644
GIT binary patch
delta 153
zcmaEJkonC)<_&wL+0BfM42_MACO?dk)iw<d3J5gGE=~>fEly7i_Abl}tSl`r%5~Kb
zt|;*@FmlWeHqQ0QHO=<0n5?KOHu<cK=;U~1_Q`fKG8)DfNk&HI7M8}wDW-<WsVQlO
zW)=p?iI$0mhKWhWmWgI*DHh45X(p2mHNAlv<rpm|2P%sKwTe!jYpODNodVlt2iY};
E0f-tg=>Px#

delta 152
zcmaEJkonC)<_&wL*^ErhO^qxkJG#heduDm~2Nnl-mX()y=cN^zCl))WmIs$*gcNvd
z=j6Mj6la#^<d>N^yBkDKR#X+6d{#zua=bG8WIGudjkFXqQ_GYj;}jEv6jNgZBNJmI
z6O&Xk)1>5NGc(I1gOn5#qa;g%w8@5=-aw6Vj24pvl|_MCMJLZSRhhg_fo-#c?3%*>
DQbjR%

diff --git a/flake.nix b/flake.nix
index 61b161794dc7b51440fb56f09c6e0ee7079b8e9f..13e7dd0615209928eae872082fb1488fb74f8591 100644
GIT binary patch
delta 14
WcmZ1)zchZsb~Z-K%{$oMY5)K+2L?6(

delta 14
WcmZ1)zchZsb~Z+f%{$oMY5)K+0R}Yy

diff --git a/homeManagerModules/firefox/custom-css/style.scss b/homeManagerModules/firefox/custom-css/style.scss
index 2f4ffb2e..3faa33ab 100644
--- a/homeManagerModules/firefox/custom-css/style.scss
+++ b/homeManagerModules/firefox/custom-css/style.scss
@@ -5,6 +5,11 @@
     --my-vertical-toolbar-width: 46px !important;
 }
 
+// Put main menu under logo
+#appMenu-popup {
+    --my-menu-button-height: 0 !important;
+}
+
 #appMenu-mainView {
 
     // Main Menu outline
@@ -25,24 +30,25 @@
     display: none !important;
 }
 
-
-// Fix url font-size
-#urlbar-input {
-    font-size: large !important;
-}
-
 // Extension padding on sidebar
 toolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
     padding: 10px !important;
 }
 
-// Hamburger button border
+// Hamburger button style
 :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button[open] {
-    border: 2px solid var(--button-background-color-primary) !important;
-    border-top-left-radius: $rounding !important;
-
     &>.toolbarbutton-badge-stack {
         border-top-left-radius: $rounding !important;
+        --my-menu-button-width: calc(var(--my-menu-button-height) + 4px) !important;
+    }
+}
+
+// Hide "Menu" label
+:root:not([chromehidden~="toolbar"]) #PanelUI-menu-button>.toolbarbutton-badge-stack {
+    .toolbarbutton-icon {
+        margin-right: 4px;
+        margin-left: 2px;
+        margin-top: 4px;
     }
 }
 
@@ -73,7 +79,7 @@ toolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
 /* Extensions button into the "left-sidebar" - Immovable */
 :root:not([chromehidden~="toolbar"],
     [sizemode="fullscreen"]) #PersonalToolbar {
-    --padding-top-left-sidebar: 110px !important;
+    --padding-top-left-sidebar: 75px !important;
     /* 182px to one-line config */
 }
 
diff --git a/inputs/default.nix b/inputs/default.nix
index 466c48e1..31165859 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -368,7 +368,7 @@ let
     {
       owner = "Godiesc";
       repo = "firefox-gx";
-      ref = "v.9.8";
+      ref = "v.9.9";
     }
     {
       name = "git-theme-src";