From 9cfe53b0a6ee05fd57d1fb8f143a08040e99aee5 Mon Sep 17 00:00:00 2001
From: Cynthia Foxwell <gamers@riseup.net>
Date: Thu, 25 Apr 2024 14:03:19 -0600
Subject: [PATCH] Fix context menu colors being wrong and having a border on
 most themes, fix scrollbar background to use face instead of shadow

---
 chrome/msfx/msfx.css   | 17 +++++++++--------
 chrome/scrollbar.uc.js |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/chrome/msfx/msfx.css b/chrome/msfx/msfx.css
index bceee95..e89d8c5 100644
--- a/chrome/msfx/msfx.css
+++ b/chrome/msfx/msfx.css
@@ -6,8 +6,9 @@ panel {
   --panel-shadow-margin: 0 !important;
   --panel-border-radius: 0 !important;
   --panel-padding-block: 0 !important;
-  --panel-background: Window !important;
+  --panel-background: -moz-Dialog !important;
   --panel-color: -moz-DialogText !important;
+  --panel-border-color: transparent !important;
 }
 
 #urlbar-container {
@@ -17,11 +18,11 @@ panel {
 #urlbar {
   --urlbar-height: 22px !important;
   --urlbar-toolbar-height: 22px !important;
-  color: WindowText !important;
+  color: -moz-DialogText !important;
 }
 
 #urlbar-scheme {
-  color: WindowText !important;
+  color: -moz-DialogText !important;
 }
 
 /* Add 3D Borders back to context menus. */
@@ -185,7 +186,7 @@ menuseparator:not([hidden="true"])::before {
 }
 
 .tab-close-button:hover {
-  background-color: WindowText;
+  background-color: -moz-DialogText;
   opacity: 0.5 !important;
 }
 
@@ -1339,7 +1340,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
 
 findbar {
   background-color: ThreeDFace !important;
-  color: WindowText !important;
+  color: -moz-DialogText !important;
   transition: none !important;
   border-top: 0 !important;
   padding-block-start: 4px !important;
@@ -1354,7 +1355,7 @@ findbar {
   background-color: unset !important;
   padding: 0px 3px !important;
   height: 22px !important;
-  color: WindowText !important;
+  color: -moz-DialogText !important;
 }
 
 .findbar-find-previous,
@@ -1511,7 +1512,7 @@ treecolpicker {
 }
 
 #sidebar-close .toolbarbutton-icon {
-  background-color: WindowText !important;
+  background-color: -moz-DialogText !important;
   width: 8px !important;
   height: 7px !important;
   mask-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA4SURBVBhXY2RgYPgPxCAAYiMDmDgYgDjIAnA+si4UHUCAbiIYoJtEvAnoOuF8kCqYBLqdQHEGBgAx7A/5GaSbcgAAAABJRU5ErkJggg==") !important;
@@ -1697,7 +1698,7 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
 
 .customizationmode-button {
   appearance: button !important;
-  color: WindowText !important;
+  color: -moz-DialogText !important;
   font-weight: 500 !important;
 }
 
diff --git a/chrome/scrollbar.uc.js b/chrome/scrollbar.uc.js
index 9470e6a..cae4697 100644
--- a/chrome/scrollbar.uc.js
+++ b/chrome/scrollbar.uc.js
@@ -90,7 +90,7 @@ slider[orient="vertical"]
   -moz-default-appearance: none;
   background-color: ${colors.ThreeDHighlight} !important;
   background-repeat: repeat !important;
-  background-image: url('data:image/svg+xml,<svg width="2" height="2" version="1.1" viewBox="0 0 .52917 .52917" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><g><rect x=".26458" y="0.0000" width=".26458" height=".26458" fill="${colors.ThreeDShadow}"/><rect x="0.0000" y=".26458" width=".26458" height=".26458" fill="${colors.ThreeDShadow}"/><rect x="0.0000" y="0.0000" width=".26458" height=".26458" fill="${colors.ThreeDHighlight}"/><rect x=".26458" y=".26458" width=".26458" height=".26458" fill="${colors.ThreeDHighlight}"/></g></g></svg>') !important;
+  background-image: url('data:image/svg+xml,<svg width="2" height="2" version="1.1" viewBox="0 0 .52917 .52917" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><g><rect x=".26458" y="0.0000" width=".26458" height=".26458" fill="${colors.ThreeDFace}"/><rect x="0.0000" y=".26458" width=".26458" height=".26458" fill="${colors.ThreeDFace}"/><rect x="0.0000" y="0.0000" width=".26458" height=".26458" fill="${colors.ThreeDHighlight}"/><rect x=".26458" y=".26458" width=".26458" height=".26458" fill="${colors.ThreeDHighlight}"/></g></g></svg>') !important;
 }
 
 scrollcorner