diff --git a/common/css/blockly.css b/common/css/blockly.css index e4aa3b1e..fbbcd40f 100644 --- a/common/css/blockly.css +++ b/common/css/blockly.css @@ -117,25 +117,25 @@ .classic-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconOpen, .dark-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconOpen { - background-image: url('../../common/media/sprites.png') !important; + background-image: url('../../common/media/blockly/sprites.svg') !important; background-position: -16px -17px !important; } .classic-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconClosed, .dark-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconClosed { - background-image: url('../../common/media/sprites.png') !important; + background-image: url('../../common/media/blockly/sprites.svg') !important; background-position: -32px -17px !important; } .classic-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconOpen, .dark-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconOpen { - background-image: url('../../common/media/sprites.png') !important; + background-image: url('../../common/media/blockly/sprites.svg') !important; background-position: -16px -1px !important; } .classic-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconClosed, .dark-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconClosed { - background-image: url('../../common/media/sprites.png') !important; + background-image: url('../../common/media/blockly/sprites.svg') !important; background-position: -32px -1px !important; } diff --git a/common/media/blockly/1x1.gif b/common/media/blockly/1x1.gif new file mode 100644 index 00000000..30855112 Binary files /dev/null and b/common/media/blockly/1x1.gif differ diff --git a/common/media/click.mp3 b/common/media/blockly/click.mp3 similarity index 100% rename from common/media/click.mp3 rename to common/media/blockly/click.mp3 diff --git a/common/media/click.ogg b/common/media/blockly/click.ogg similarity index 100% rename from common/media/click.ogg rename to common/media/blockly/click.ogg diff --git a/common/media/click.wav b/common/media/blockly/click.wav similarity index 100% rename from common/media/click.wav rename to common/media/blockly/click.wav diff --git a/common/media/delete-icon.svg b/common/media/blockly/delete-icon.svg similarity index 100% rename from common/media/delete-icon.svg rename to common/media/blockly/delete-icon.svg diff --git a/common/media/delete.mp3 b/common/media/blockly/delete.mp3 similarity index 100% rename from common/media/delete.mp3 rename to common/media/blockly/delete.mp3 diff --git a/common/media/delete.ogg b/common/media/blockly/delete.ogg similarity index 100% rename from common/media/delete.ogg rename to common/media/blockly/delete.ogg diff --git a/common/media/delete.wav b/common/media/blockly/delete.wav similarity index 100% rename from common/media/delete.wav rename to common/media/blockly/delete.wav diff --git a/common/media/disconnect.mp3 b/common/media/blockly/disconnect.mp3 similarity index 100% rename from common/media/disconnect.mp3 rename to common/media/blockly/disconnect.mp3 diff --git a/common/media/disconnect.ogg b/common/media/blockly/disconnect.ogg similarity index 100% rename from common/media/disconnect.ogg rename to common/media/blockly/disconnect.ogg diff --git a/common/media/disconnect.wav b/common/media/blockly/disconnect.wav similarity index 100% rename from common/media/disconnect.wav rename to common/media/blockly/disconnect.wav diff --git a/common/media/blockly/dropdown-arrow.svg b/common/media/blockly/dropdown-arrow.svg new file mode 100644 index 00000000..4e6ce19e --- /dev/null +++ b/common/media/blockly/dropdown-arrow.svg @@ -0,0 +1 @@ +dropdown-arrow \ No newline at end of file diff --git a/common/media/foldout-icon.svg b/common/media/blockly/foldout-icon.svg similarity index 100% rename from common/media/foldout-icon.svg rename to common/media/blockly/foldout-icon.svg diff --git a/common/media/handclosed.cur b/common/media/blockly/handclosed.cur similarity index 100% rename from common/media/handclosed.cur rename to common/media/blockly/handclosed.cur diff --git a/common/media/handdelete.cur b/common/media/blockly/handdelete.cur similarity index 100% rename from common/media/handdelete.cur rename to common/media/blockly/handdelete.cur diff --git a/common/media/handopen.cur b/common/media/blockly/handopen.cur similarity index 100% rename from common/media/handopen.cur rename to common/media/blockly/handopen.cur diff --git a/common/media/blockly/pilcrow.png b/common/media/blockly/pilcrow.png new file mode 100644 index 00000000..f224c358 Binary files /dev/null and b/common/media/blockly/pilcrow.png differ diff --git a/common/media/blockly/quote0.png b/common/media/blockly/quote0.png new file mode 100644 index 00000000..c7820d60 Binary files /dev/null and b/common/media/blockly/quote0.png differ diff --git a/common/media/blockly/quote1.png b/common/media/blockly/quote1.png new file mode 100644 index 00000000..826583e0 Binary files /dev/null and b/common/media/blockly/quote1.png differ diff --git a/common/media/resize-handle.svg b/common/media/blockly/resize-handle.svg similarity index 100% rename from common/media/resize-handle.svg rename to common/media/blockly/resize-handle.svg diff --git a/common/media/sprites.png b/common/media/blockly/sprites.png similarity index 100% rename from common/media/sprites.png rename to common/media/blockly/sprites.png diff --git a/common/media/blockly/sprites.svg b/common/media/blockly/sprites.svg new file mode 100644 index 00000000..3f09ef3a --- /dev/null +++ b/common/media/blockly/sprites.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/modules/mixly-modules/common/editor-blockly.js b/common/modules/mixly-modules/common/editor-blockly.js index a8c7c552..f076d7ed 100644 --- a/common/modules/mixly-modules/common/editor-blockly.js +++ b/common/modules/mixly-modules/common/editor-blockly.js @@ -59,7 +59,7 @@ class EditorBlockly extends EditorBase { this.workspace = null; this.initBlockly = () => { const DEFAULT_CATEGORIES = HTMLTemplate.get('xml/default-categories.xml').render(); - const media = path.join(Env.srcDirPath, 'common/media/'); + const media = path.join(Env.srcDirPath, 'common/media/blockly'); const renderer = ['geras', 'zelos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras'; this.editor = Blockly.inject(this.$blockly[0], { media,