From 4bdaa4e89a35b2b3d53086ca871894bc5bd1090e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=BD=92=E4=BA=91=E5=B8=86?= <1138663075@qq.com> Date: Mon, 5 May 2025 09:14:12 +0000 Subject: [PATCH] =?UTF-8?q?!4=20feat(blockly):=20=E6=B7=BB=E5=8A=A0thrasos?= =?UTF-8?q?=E7=A7=AF=E6=9C=A8=E6=B8=B2=E6=9F=93=E5=99=A8=20*=20feat(blockl?= =?UTF-8?q?y):=20=E5=B0=86=E9=BB=98=E8=AE=A4=E7=A7=AF=E6=9C=A8=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E5=99=A8=E4=BB=8E=20thrasos=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20geras=20*=20feat(blockly):=20=E6=B7=BB=E5=8A=A0thra?= =?UTF-8?q?sos=E7=A7=AF=E6=9C=A8=E6=B8=B2=E6=9F=93=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/blockly.css | 15 +++++++++++++++ .../mixly-modules/common/editor-blockly.js | 2 +- mixly-sw/templete/setting-div.html | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/common/css/blockly.css b/common/css/blockly.css index 7b260222..279fa73a 100644 --- a/common/css/blockly.css +++ b/common/css/blockly.css @@ -146,6 +146,11 @@ box-sizing: unset; } +.classic-theme.thrasos-renderer .blocklyMenu > .blocklyMenuItem { + background-color: #fff; + color: #2f2f2f; +} + .classic-theme.geras-renderer .blocklyMenu > .blocklyMenuItem { background-color: #fff; color: #2f2f2f; @@ -185,6 +190,12 @@ box-sizing: unset; } +.dark-theme.thrasos-renderer .blocklyMenu > .blocklyMenuItem { + background-color: #252525; + color: #eee; + font-family: "Lato", "Noto Sans SC"; +} + .dark-theme.geras-renderer .blocklyMenu > .blocklyMenuItem { background-color: #252525; color: #eee; @@ -233,4 +244,8 @@ .geras-renderer.dark-theme .blocklyText { color: #000; +} + +.thrasos-renderer.dark-theme .blocklyText { + color: #000; } \ No newline at end of file diff --git a/common/modules/mixly-modules/common/editor-blockly.js b/common/modules/mixly-modules/common/editor-blockly.js index fbbe3ad2..6b0c286c 100644 --- a/common/modules/mixly-modules/common/editor-blockly.js +++ b/common/modules/mixly-modules/common/editor-blockly.js @@ -60,7 +60,7 @@ class EditorBlockly extends EditorBase { this.initBlockly = () => { const DEFAULT_CATEGORIES = HTMLTemplate.get('xml/default-categories.xml').render(); const media = path.join(Env.srcDirPath, 'common/media/blockly'); - const renderer = ['geras', 'zelos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras'; + const renderer = ['geras', 'zelos', 'thrasos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras'; this.editor = Blockly.inject(this.$blockly[0], { media, toolbox: DEFAULT_CATEGORIES, diff --git a/mixly-sw/templete/setting-div.html b/mixly-sw/templete/setting-div.html index c5821362..56a3d673 100644 --- a/mixly-sw/templete/setting-div.html +++ b/mixly-sw/templete/setting-div.html @@ -311,6 +311,7 @@