Skip to content
This repository was archived by the owner on Jul 24, 2019. It is now read-only.

Commit 3519508

Browse files
Mahboobeh-binaryMahboobeh-binary
authored
Merge pull request #10 from aaron-binary/import-scratch-to-derivbot
Import scratch to derivbot
2 parents 910e9bf + 1ec960d commit 3519508

File tree

144 files changed

+8337
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+8337
-520
lines changed

‎index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
</head>
1010
<body>
1111
<div id="root" role="main"></div>
12-
<script src="./dist/scratch-compressed.js"></script>
13-
<script src="./dist/scratch-messages.js"></script>
12+
<script src="./dist/scratch.js"></script>
1413
<script src="./dist/bot.js"></script>
1514
</body>
1615

‎package-lock.json‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@
109109
"vinyl-paths": "^2.1.0",
110110
"webpack": "^4.32.2",
111111
"webpack-cli": "^3.3.2",
112-
"webpack-dev-server": "^3.4.1"
112+
"webpack-dev-server": "^3.4.1",
113+
"webpack-merge-and-include-globally": "^2.1.16"
113114
},
114115
"dependencies": {
115116
"@binary-com/smartcharts": "^0.3.9",

‎src/assets/sass/scratch/_blockly-toolbox.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
}
5353

5454
.blocklyToolboxDiv {
55-
background-color: $brand-gray !important;
5655
border-width: thin;
5756
color: $brand-dark-gray;
5857
border-right: 0.06em solid;
@@ -84,6 +83,7 @@
8483
}
8584

8685
.blocklySvg {
86+
background-color: $white !important;
8787
position: absolute;
8888
}
8989

‎src/scratch/blocks/Advanced/Functions/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import './procedures_defnoreturn';
2+
import './procedures_defreturn';
3+
import './procedures_callnoreturn';
4+
import './procedures_callreturn';
5+
import './procedures_ifreturn';

0 commit comments

Comments
 (0)