Merge branch 'master' into new-blocks

2020-09-17 13:25:43 +00:00
parent 42299a374a d70207ea1a
commit 38b025e012
41 changed files with 527 additions and 198 deletions
@@ -63,8 +63,8 @@ class BlocklyWindow extends Component {
            length: 1,
            colour: '#4EAF47', // senseBox-green
            snap: false
-          }}
-        media={'/media/'}
+        }}
+        media={'/media/blockly/'}
        move={this.props.move !== undefined && !this.props.move ? {} :
          { // https://developers.google.com/blockly/guides/configure/web/move
            scrollbars: true,