From efa139dd7c54a1d147d080226b3a0568097f7993 Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Fri, 29 Dec 2023 01:42:06 -0600
Subject: [PATCH] merge-upstream: fix more dark mode bugs

---
 package-lock.json                    |  4 ++--
 src/components/forms/input.css       |  1 +
 src/components/menu-bar/menu-bar.css |  2 +-
 src/css/colors.css                   |  2 ++
 src/lib/themes/default/index.js      | 12 +++++++++++-
 src/lib/themes/guiHelpers.js         |  6 ------
 src/lib/themes/tw/index.js           |  6 +++++-
 7 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9b770e18..0c9ed71b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23193,7 +23193,7 @@
     },
     "node_modules/scratch-paint": {
       "version": "2.1.61",
-      "resolved": "git+ssh://git@github.com/TurboWarp/scratch-paint.git#e28dc7a258d6ef017d78910352825ded022f7602",
+      "resolved": "git+ssh://git@github.com/TurboWarp/scratch-paint.git#030503c68f9b694827dd4426315913db4bcc093a",
       "license": "GPL-3.0",
       "dependencies": {
         "@scratch/paper": "0.11.20221201200345",
@@ -44527,7 +44527,7 @@
       }
     },
     "scratch-paint": {
-      "version": "git+ssh://git@github.com/TurboWarp/scratch-paint.git#e28dc7a258d6ef017d78910352825ded022f7602",
+      "version": "git+ssh://git@github.com/TurboWarp/scratch-paint.git#030503c68f9b694827dd4426315913db4bcc093a",
       "from": "scratch-paint@github:TurboWarp/scratch-paint#merge-upstream",
       "requires": {
         "@scratch/paper": "0.11.20221201200345",
diff --git a/src/components/forms/input.css b/src/components/forms/input.css
index ce0ab17b7..ac7fbc733 100644
--- a/src/components/forms/input.css
+++ b/src/components/forms/input.css
@@ -9,6 +9,7 @@
     font-size: 0.625rem;
     font-weight: bold;
     color: $text-primary;
+    background-color: $input-background;
 
     border-width: 1px;
     border-style: solid;
diff --git a/src/components/menu-bar/menu-bar.css b/src/components/menu-bar/menu-bar.css
index 1b136d12c..8b02fad6e 100644
--- a/src/components/menu-bar/menu-bar.css
+++ b/src/components/menu-bar/menu-bar.css
@@ -99,7 +99,7 @@
 }
 
 .feedback-link {
-    color: $looks-secondary;
+    color: $menu-bar-background;
     text-decoration: none;
 }
 
diff --git a/src/css/colors.css b/src/css/colors.css
index 285cb5c61..1d829fffc 100644
--- a/src/css/colors.css
+++ b/src/css/colors.css
@@ -58,6 +58,8 @@ $menu-bar-foreground: var(--menu-bar-foreground);
 
 $assets-background: var(--assets-background);
 
+$input-background: var(--input-background);
+
 $page-background: var(--page-background);
 $page-foreground: var(--page-foreground);
 
diff --git a/src/lib/themes/default/index.js b/src/lib/themes/default/index.js
index 883f7ec7a..9ff900f3d 100644
--- a/src/lib/themes/default/index.js
+++ b/src/lib/themes/default/index.js
@@ -175,10 +175,20 @@ const guiColors = {
 
     'assets-background': '#ffffff',
 
+    'input-background': '#ffffff',
+
     'page-background': '#ffffff',
     'page-foreground': '#000000',
 
-    'link-color': '#2255dd'
+    'link-color': '#2255dd',
+
+    'paint-ui-pane-border': 'var(--ui-black-transparent)',
+    'paint-text-primary': 'var(--text-primary)',
+    'paint-form-border': 'var(--ui-black-transparent)',
+    'paint-looks-secondary': 'var(--looks-secondary)',
+    'paint-looks-transparent': 'var(--looks-transparent)',
+    'paint-input-background': 'var(--input-background)',
+    'paint-popover-background': '#ffffff'
 };
 
 export {
diff --git a/src/lib/themes/guiHelpers.js b/src/lib/themes/guiHelpers.js
index d1e224a60..87801b6c1 100644
--- a/src/lib/themes/guiHelpers.js
+++ b/src/lib/themes/guiHelpers.js
@@ -8,12 +8,6 @@ const applyGuiColors = theme => {
         doc.style.setProperty(`--${name}`, value);
     }
 
-    doc.style.setProperty('--paint-ui-pane-border', 'var(--ui-black-transparent)');
-    doc.style.setProperty('--paint-text-primary', 'var(--text-primary)');
-    doc.style.setProperty('--paint-form-border', 'var(--ui-black-transparent)');
-    doc.style.setProperty('--paint-looks-secondary', 'var(--looks-secondary)');
-    doc.style.setProperty('--paint-looks-transparent', 'var(--looks-transparent)');
-
     doc.style.colorScheme = themeObject.isDark ? 'dark' : 'light';
 
     window.Recolor = {
diff --git a/src/lib/themes/tw/index.js b/src/lib/themes/tw/index.js
index 8291e1693..86552dddd 100644
--- a/src/lib/themes/tw/index.js
+++ b/src/lib/themes/tw/index.js
@@ -60,10 +60,14 @@ const darkGuiColors = {
 
     'assets-background': '#111111',
 
+    'input-background': '#1e1e1e',
+
     'page-background': '#111111',
     'page-foreground': '#eeeeee',
 
-    'link-color': '#44aaff'
+    'link-color': '#44aaff',
+
+    'paint-popover-background': '#333333'
 };
 
 export {