Update to latest TS and update blocks colors to match Lego's edu colors

This commit is contained in:
Sam El-Husseini 2017-12-11 16:55:00 -08:00
parent 5656031e2d
commit 1bf1eb16f0
13 changed files with 39 additions and 41 deletions

View File

@ -1,4 +1,3 @@
/// <reference path="../node_modules/pxt-core/typings/globals/node/index.d.ts"/>
/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" /> /// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
import * as fs from 'fs'; import * as fs from 'fs';

View File

@ -1,4 +1,3 @@
/// <reference path="../node_modules/pxt-core/typings/globals/node/index.d.ts"/>
/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" /> /// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
import * as path from "path"; import * as path from "path";

View File

@ -8,6 +8,7 @@
"module": "commonjs", "module": "commonjs",
"rootDir": ".", "rootDir": ".",
"newLine": "LF", "newLine": "LF",
"sourceMap": false "sourceMap": false,
"types": ["node"]
} }
} }

View File

@ -142,15 +142,10 @@
"loops.forever": "Repeats the code forever in the background. On each iteration, allows other codes to run.", "loops.forever": "Repeats the code forever in the background. On each iteration, allows other codes to run.",
"loops.pause": "Pause for the specified time in milliseconds", "loops.pause": "Pause for the specified time in milliseconds",
"loops.pause|param|ms": "how long to pause for, eg: 100, 200, 500, 1000, 2000", "loops.pause|param|ms": "how long to pause for, eg: 100, 200, 500, 1000, 2000",
"loops.timePicker": "Get the time field editor",
"loops.timePicker|param|ms": "time duration in milliseconds, eg: 500, 1000",
"loops.waitUntil": "Busy wait for a condition to be true",
"loops.waitUntil|param|condition": "condition to test for",
"loops.waitUntil|param|timeOut": "if positive, maximum duration to wait for in milliseconds",
"loops.when": "Runs code when the condition becomes true",
"loops.when|param|condition": "condition to test",
"loops.when|param|handler": "code to run",
"parseInt": "Convert a string to an integer.", "parseInt": "Convert a string to an integer.",
"pauseUntil": "Busy wait for a condition to be true",
"pauseUntil|param|condition": "condition to test for",
"pauseUntil|param|timeOut": "if positive, maximum duration to wait for in milliseconds",
"serial": "Reading and writing data over a serial connection.", "serial": "Reading and writing data over a serial connection.",
"serial.writeBuffer": "Send a buffer across the serial connection.", "serial.writeBuffer": "Send a buffer across the serial connection.",
"serial.writeLine": "Write a line of text to the serial port.", "serial.writeLine": "Write a line of text to the serial port.",

View File

@ -31,7 +31,6 @@
"control|block": "control", "control|block": "control",
"loops.forever|block": "forever", "loops.forever|block": "forever",
"loops.pause|block": "pause %pause=timePicker|ms", "loops.pause|block": "pause %pause=timePicker|ms",
"loops.timePicker|block": "%ms",
"loops|block": "loops", "loops|block": "loops",
"parseInt|block": "parse to integer %text", "parseInt|block": "parse to integer %text",
"serial.writeBuffer|block": "serial|write buffer %buffer", "serial.writeBuffer|block": "serial|write buffer %buffer",

View File

@ -17,8 +17,7 @@
"control.cpp", "control.cpp",
"control.ts", "control.ts",
"serial.cpp", "serial.cpp",
"serial.ts", "serial.ts"
"loops.ts"
], ],
"testFiles": [ "testFiles": [
"test.ts" "test.ts"

View File

@ -1,19 +1,19 @@
//% color="#00A5C8" weight=100 //% color="#68C3E2" weight=100
//% groups='["Light", "Buttons", "Screen"]' //% groups='["Light", "Buttons", "Screen"]'
namespace brick { namespace brick {
} }
//% color="#D42878" weight=95 //% color="#C8509B" weight=95
namespace sensors { namespace sensors {
} }
//% color="#8AC044" weight=90 icon="\uf185" //% color="#A5CA18" weight=90 icon="\uf185"
namespace motors { namespace motors {
} }
//% color="#DF5014" weight=80 //% color="#D67923" weight=80
namespace music { namespace music {
} }
@ -33,12 +33,12 @@ namespace serial {
} }
//% color="#0F841C" //% color="#58AB41"
namespace loops { namespace loops {
} }
//% color="#4c97ff" //% color="#1E5AA8"
namespace light { namespace light {
} }

View File

@ -32,15 +32,18 @@
"main": "built/pxtrequire.js", "main": "built/pxtrequire.js",
"typings": "built/pxtrequire.d.ts", "typings": "built/pxtrequire.d.ts",
"devDependencies": { "devDependencies": {
"typescript": "^1.8.7", "typescript": "2.6.1",
"less": "^2.6.0", "less": "^2.6.0",
"rtlcss": "^2.1.2", "rtlcss": "^2.1.2",
"autoprefixer": "^6.7.6", "autoprefixer": "^6.7.6",
"semantic-ui-less": "^2.2.4" "semantic-ui-less": "^2.2.4",
"@types/bluebird": "2.0.33",
"@types/jquery": "3.2.16",
"@types/node": "8.0.53"
}, },
"dependencies": { "dependencies": {
"pxt-common-packages": "0.14.5", "pxt-common-packages": "0.14.12",
"pxt-core": "2.3.37" "pxt-core": "3.0.1"
}, },
"scripts": { "scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis" "test": "node node_modules/pxt-core/built/pxt.js travis"

View File

@ -63,7 +63,10 @@
"listsBlocks": true, "listsBlocks": true,
"functionBlocks": true, "functionBlocks": true,
"onStartNamespace": "loops", "onStartNamespace": "loops",
"onStartColor": "#0F841C" "onStartColor": "#0F841C",
"pauseUntilBlock": {
"category": "loops"
}
}, },
"compileService": { "compileService": {
"buildEngine": "dockermake", "buildEngine": "dockermake",
@ -122,12 +125,12 @@
"blocklyOptions": { "blocklyOptions": {
}, },
"blockColors": { "blockColors": {
"loops": "#0F841C", "loops": "#58AB41",
"logic": "#3979B9", "logic": "#1E5AA8",
"math": "#8A83BA", "math": "#9DC3F7",
"variables": "#D4000D", "variables": "#B40000",
"text": "#F0890A", "text": "#F0890A",
"advanced": "#7A8284", "advanced": "#969696",
"functions": "#064597", "functions": "#064597",
"arrays": "#890058" "arrays": "#890058"
}, },

View File

@ -1,4 +1,3 @@
/// <reference path="../node_modules/pxt-core/typings/globals/bluebird/index.d.ts"/>
/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/> /// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
/// <reference path="../node_modules/pxt-core/built/pxtrunner.d.ts"/> /// <reference path="../node_modules/pxt-core/built/pxtrunner.d.ts"/>

View File

@ -7,6 +7,9 @@
"out": "../built/sim.js", "out": "../built/sim.js",
"rootDir": ".", "rootDir": ".",
"newLine": "LF", "newLine": "LF",
"sourceMap": false "sourceMap": false,
"lib": ["dom", "dom.iterable", "scripthost", "es6"],
"types": ["jquery", "bluebird"],
"typeRoots": ["../node_modules/@types"]
} }
} }

View File

@ -7,18 +7,16 @@
/* Toolbox padding */ /* Toolbox padding */
.blocklyToolboxDiv, .monacoToolboxDiv { .blocklyToolboxDiv, .monacoToolboxDiv {
padding: 0.5rem; padding: 0.5rem;
-webkit-box-shadow: inset 0px 0px 0px 2px rgba(255,255,255,0.31); box-shadow: inset 0px 0px 0px 2px #D3A805;
-moz-box-shadow: inset 0px 0px 0px 2px rgba(255,255,255,0.31);
box-shadow: inset 0px 0px 0px 2px rgba(255,255,255,0.31);
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
} }
div.blocklyTreeRow { div.blocklyTreeRow {
border-radius: 0px; border-radius: 0px;
-webkit-box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.1); -webkit-box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.2);
-moz-box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.1); -moz-box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.2);
box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.1); box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.2);
} }
/* Remove shadow around blockly blocks */ /* Remove shadow around blockly blocks */

View File

@ -139,8 +139,8 @@
Editor Editor
--------------------*/ --------------------*/
@blocklyToolboxColor: #FED30D; @blocklyToolboxColor: #FAC80A;
@trashIconColor: @primaryColor; @trashIconColor: white;
/*------------------- /*-------------------