From 8b14a315a3afe474af91fb8c49dce629e0d4b135 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 25 May 2023 01:54:44 +0800
Subject: [PATCH] update

---
 src/other/firefox/WhiteSur/colors/dark.css |  6 +--
 src/other/firefox/common/parts/icons.css   |  4 +-
 src/other/firefox/common/parts/popups.css  | 52 ++++++++++++----------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css
index 00d3de7..df37a33 100644
--- a/src/other/firefox/WhiteSur/colors/dark.css
+++ b/src/other/firefox/WhiteSur/colors/dark.css
@@ -33,7 +33,7 @@
 	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
 	--gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1);
 	--gnome-popover-button-active-background: rgba(255, 255, 255, 0.15);
-	--gnome-popover-separator-color: rgba(0, 0, 0, 0.1);
+	--gnome-popover-separator-color: rgba(255, 255, 255, 0.1);
 
 	/* Header bar */
 	--gnome-headerbar-background: #373737;
@@ -55,8 +55,8 @@
 	--gnome-button-active-border-color: #1b1b1b;
 	--gnome-button-active-border-accent-color: #1b1b1b;
 	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-disabled-background: #505050;
-	--gnome-button-disabled-border-color: #323232;
+	--gnome-button-disabled-background: linear-gradient(to top, rgba(#636363, 0.45) 0%, rgba(#696969, 0.45) 100%);
+	--gnome-button-disabled-border-color: #282828;
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
 	--gnome-inactive-button-background: linear-gradient(#383838, #383838);
 	--gnome-inactive-button-border-color: #323232;
diff --git a/src/other/firefox/common/parts/icons.css b/src/other/firefox/common/parts/icons.css
index b41600e..5bb60dd 100644
--- a/src/other/firefox/common/parts/icons.css
+++ b/src/other/firefox/common/parts/icons.css
@@ -335,7 +335,7 @@ menu[disabled] > .menu-right {
 }
 #stop-button,
 .downloadIconCancel > .button-box > .button-icon,
-#context-stop {
+#context-stop .menu-iconic-icon {
 	list-style-image: url("../icons/process-stop-symbolic.svg") !important;
 }
 #downloads-button .toolbarbutton-icon { /* Downloads button / Glitch - it swaps to the default one anyway */
@@ -685,7 +685,7 @@ treechildren::-moz-tree-image {
 	#context-reload .menu-iconic-icon,
 	#stop-button .toolbarbutton-icon,
 	.downloadIconCancel > .button-box > .button-icon,
-	#context-stop,
+	#context-stop .menu-iconic-icon,
 	#downloads-button .toolbarbutton-icon,
 	#sync-button .toolbarbutton-icon,
 	#new-window-button .toolbarbutton-icon,
diff --git a/src/other/firefox/common/parts/popups.css b/src/other/firefox/common/parts/popups.css
index 5ebac05..e4a0d0b 100644
--- a/src/other/firefox/common/parts/popups.css
+++ b/src/other/firefox/common/parts/popups.css
@@ -22,6 +22,7 @@ menupopup, panel,
 :is(panel, menupopup)::part(content) {
 	--panel-border-color: transparent !important;
 	--arrowpanel-border-color: transparent !important;
+	--panel-separator-color: var(--gnome-popover-separator-color) !important;
 }
 
 .panel-arrowcontent {
@@ -45,14 +46,6 @@ menupopup label {
 	color: var(--gnome-toolbar-color) !important;
 }
 
-#PlacesToolbar menupopup[placespopup="true"]::part(content),
-#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox),
-#PlacesToolbar menupopup {
-	background: none !important;
-	padding: 3px 4px 6px !important;
-	margin: -3px 0 0 -12px !important;
-}
-
 menubar > menu > menupopup {
 	border-top-left-radius: 0 !important;
 	border-top-right-radius: 0 !important;
@@ -66,10 +59,36 @@ menuitem[type="checkbox"] image, menuitem[type="radio"] image {
 	visibility: visible !important;
 }
 
-menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
+menuitem[disabled="true"],
+menupopup menu[disabled="true"],
+menuitem[disabled="true"]:hover,
+menupopup menu[disabled="true"]:hover {
 	background: transparent !important;
 }
 
+/* Bookmarks Folder Popup */
+#PlacesToolbar menupopup[placespopup="true"]::part(content),
+#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox),
+#PlacesToolbar menupopup {
+	background: none !important;
+	padding: 3px 4px 6px !important;
+	margin: -3px 0 0 -12px !important;
+}
+
+/* Bookmarks Button Popup */
+#BMB_bookmarksPopup {
+	margin: 10px -18px !important;
+	box-shadow: none !important;
+}
+
+#BMB_bookmarksPopup menupopup {
+	padding: 6px !important;
+}
+
+panel:not([remote]), #BMB_bookmarksPopup {
+	--arrowpanel-background: var(--gnome-popover-background) !important;
+}
+
 /* Adjust popovers position */
 panel[type="arrow"] {
 	appearance: none !important;
@@ -104,21 +123,6 @@ panelview {
 	stroke: transparent !important;
 }
 
-#BMB_bookmarksPopup {
-	margin-top: 4px !important;
-	padding: 6px !important;
-	box-shadow: none !important;
-	--panel-padding: 6px !important;
-}
-
-#BMB_bookmarksPopup menupopup {
-	padding: 6px !important;
-}
-
-panel:not([remote]), #BMB_bookmarksPopup {
-	--arrowpanel-background: var(--gnome-popover-background) !important;
-}
-
 .PanelUI-subView toolbarseparator:not([orient="vertical"]) {
 	margin: 10px 2px !important;
 }