From 48444047f119a6fbe706b2cb4e822bbb80bfcb8a Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 10 Dec 2024 16:18:10 -0500
Subject: [PATCH] fix(firefix-gx): update all personal changes

---
 homeManagerModules/firefox/custom-css.nix | 132 ++++++++--------------
 1 file changed, 45 insertions(+), 87 deletions(-)

diff --git a/homeManagerModules/firefox/custom-css.nix b/homeManagerModules/firefox/custom-css.nix
index 552f9952..3d135b4b 100644
--- a/homeManagerModules/firefox/custom-css.nix
+++ b/homeManagerModules/firefox/custom-css.nix
@@ -1,18 +1,27 @@
 rounding:
 # css
 ''
+  :root * {
+      --tab-height-personal: 40px !important;
+      --uc-tab-corner-height: 41px !important;
+      --uc-vertical-toolbar-width: 46px !important;
+  }
+
+  /* Main Menu outline */
+  #appMenu-mainView .panel-subview-body {
+      outline: 2px solid var(--button-background-color-primary);
+  }
+
   /* Hide unused menu rows */
-  .browser-toolbar>* #alltabs-button,
+  #appMenu-mainView .browser-toolbar > * #alltabs-button,
   #appMenu-fxa-status2,
   #appMenu-fxa-separator {
       display: none !important;
   }
 
-  :root * {
-      --margin-left-icons-personal: 3px !important;
-      --tab-height-personal: 40px !important;
-      --uc-tab-corner-height: 41px !important;
-      --uc-vertical-toolbar-width: 46px !important;
+  /* Makes main menu rows all the same height */
+  #appMenu-mainView .subviewbutton {
+      min-height: 40px !important;
   }
 
   /* Fix url font-size */
@@ -20,11 +29,37 @@ rounding:
       font-size: large !important;
   }
 
-  /* Fix left side of tabs going past what it should */
-  scrollbox {
-      margin-left: 5px;
+  /* Extension padding on sidebar */
+  toolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
+      padding: 10px !important;
   }
 
+  /* Hamnburger button border */
+  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button[open] {
+      border: 2px solid var(--button-background-color-primary) !important;
+      border-top-left-radius: ${toString rounding}px !important;
+  }
+  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button[open] > .toolbarbutton-badge-stack {
+      border-top-left-radius: ${toString rounding}px !important;
+  }
+
+  /* Fix extension dialog going off screen */
+  #appMenu-addon-installed-notification,
+  #notification-popup {
+      margin-top: -1px !important;
+      margin-inline: -505px !important;
+  }
+  #customizationui-widget-panel {
+      margin-top: -1px !important;
+  }
+  #PersonalToolbar .toolbarbutton-1 {
+      margin-block: 0px !important;
+  }
+  #PersonalToolbar #PlacesToolbarItems > .bookmark-item {
+      margin-block: 6px !important;
+  }
+
+  /* -------------------------------------------------------------- */
   /* https://github.com/Godiesc/firefox-gx/blob/main/Tricks/README.md */
   /* Extensions button into the "left-sidebar" - Immovable */
   :root:not([chromehidden~="toolbar"],
@@ -38,7 +73,7 @@ rounding:
       position: fixed;
       display: flex;
       top: 42px !important;
-      left: 1px !important;
+      left: 3px !important;
       z-index: 2 !important;
       fill: var(--general-color) !important;
       width: calc(var(--uc-vertical-toolbar-width) - 4px) !important;
@@ -55,81 +90,4 @@ rounding:
       transform: scale(1.12) !important;
       transition-duration: 0ms !important;
   }
-
-  /* Fix extension dialog going off screen */
-  #appMenu-addon-installed-notification,
-  #notification-popup {
-      margin-top: -1px !important;
-      margin-inline: -505px !important;
-  }
-
-  #customizationui-widget-panel {
-      margin-top: -1px !important;
-  }
-
-  #PersonalToolbar .toolbarbutton-1 {
-      margin-block: 0px !important;
-  }
-
-  #PersonalToolbar #PlacesToolbarItems>.bookmark-item {
-      margin-block: 6px !important;
-  }
-
-  /* -------------------------------------------------------------- */
-  /* Fix menu */
-  :root:not([chromehidden~="toolbar"],
-  [sizemode="fullscreen"]) #PanelUI-menu-button,
-  :root[sizemode="maximized"] #appMenu-popup,
-  :root[sizemode="maximized"] #appMenu-popup {
-      --tab-height-personal: unset !important;
-  }
-
-  :root:not([chromehidden~="toolbar"])[sizemode="maximized"] #appMenu-popup>panelmultiview>box>box>panelview {
-      padding-top: unset !important;
-  }
-
-  /* Hamburger menu width */
-  :root:not([chromehidden~="toolbar"],
-  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button .toolbarbutton-badge-stack,
-  [sizemode="fullscreen"]):is([sizemode="maximized"]) #PanelUI-menu-button[open]>stack {
-      min-width: 46px !important;
-  }
-
-  toolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
-      padding: 10px !important;
-  }
-
-  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button[open]>.toolbarbutton-badge-stack {
-      width: unset !important;
-      border-top-left-radius: ${toString rounding}px !important;
-  }
-
-  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button>stack {
-      display: unset;
-      align-items: unset !important;
-  }
-
-  /* Remove text and places panel correctly */
-  :root:not([chromehidden~="toolbar"]) #PanelUI-menu-button>stack::after {
-      width: unset !important;
-      content: unset;
-      color: unset !important;
-      text-shadow: unset !important;
-  }
-
-  :root:not([chromehidden~="toolbar"])[sizemode="maximized"] #appMenu-popup {
-      appearance: unset !important;
-      margin-top: -1px !important;
-      clip-path: unset;
-      --arrowpanel-menuitem-padding: unset !important;
-  }
-
-  :root:is([sizemode="maximized"]):not([tabsintitlebar],
-  [chromehidden~="toolbar"]) #appMenu-popup {
-      margin-top: unset !important;
-  }
-
-  .subviewbutton {
-      min-height: 40px !important;
-  }
 ''