From 27376e2c5a8aa43b1282b2b674ce35768868325c Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 10 Jan 2024 01:53:58 -0600
Subject: [PATCH 1/2] Fix note picker label colors in some dark modes

---
 core/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/css.js b/core/css.js
index 1c814cb0eb..90b57138b2 100644
--- a/core/css.js
+++ b/core/css.js
@@ -1015,7 +1015,7 @@ Blockly.Css.CONTENT = [
   '.scratchNotePickerKeyLabel {',
     'font-family: "Helvetica Neue", Helvetica, sans-serif;',
     'font-size: 0.75rem;',
-    'fill: $colour_textFieldText;',
+    'fill: #575E75;', // the keys are always white, so don't color the labels
     'pointer-events: none;',
   '}',
 

From 7e7aff54ed7d25384658745bb974a4e043ebd77f Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 10 Jan 2024 02:05:04 -0600
Subject: [PATCH 2/2] Add blackText placeholder color for text that is always
 displayed on a white background

---
 core/colours.js | 1 +
 core/css.js     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/colours.js b/core/colours.js
index 4736e94e39..0056a93715 100644
--- a/core/colours.js
+++ b/core/colours.js
@@ -98,6 +98,7 @@ Blockly.Colours = {
   "toolboxHover": "#4C97FF",
   "toolboxSelected": "#e9eef2",
   "toolboxText": "#575E75",
+  "blackText": "#575E75",
   "toolbox": "#FFFFFF",
   "flyout": "#F9F9F9",
   "scrollbar": "#CECDCE",
diff --git a/core/css.js b/core/css.js
index 90b57138b2..94ffc4b50c 100644
--- a/core/css.js
+++ b/core/css.js
@@ -994,7 +994,7 @@ Blockly.Css.CONTENT = [
   '.scratchColourPickerLabel {',
     'font-family: "Helvetica Neue", Helvetica, sans-serif;',
     'font-size: 0.65rem;',
-    'color: $colour_toolboxText;',
+    'color: $colour_blackText;',
     'margin: 8px;',
   '}',
 
@@ -1015,7 +1015,7 @@ Blockly.Css.CONTENT = [
   '.scratchNotePickerKeyLabel {',
     'font-family: "Helvetica Neue", Helvetica, sans-serif;',
     'font-size: 0.75rem;',
-    'fill: #575E75;', // the keys are always white, so don't color the labels
+    'fill: $colour_blackText;',
     'pointer-events: none;',
   '}',