Merge branch 'develop' into develop-builds

TurboWarp · Jan 10, 2024 · 7fbc394 · 7fbc394
2 parents be61498 + 7e7aff5
commit 7fbc394
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: $colour_textFieldText;',
+    'fill: $colour_blackText;',
     'pointer-events: none;',
   '}',