From f255e1a903ded3d5d43006c35d34ee3431745f1d Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 21:14:27 -0800 Subject: [PATCH 01/20] Bump pxt-core to 0.7.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94b31a9f..219913fa 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.5" + "pxt-core": "0.7.8" } } From 360e2b7ba66231943737469227e6319d70f0b299 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 21:14:29 -0800 Subject: [PATCH 02/20] 0.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 219913fa..b3d4fa70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.3", + "version": "0.7.4", "description": "calliope target for PXT", "keywords": [ "JavaScript", From 98eab3672ff6933f1d513759b792e62c610816a3 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 22:36:06 -0800 Subject: [PATCH 03/20] updated css breakpoints --- pxtarget.json | 10 +++++++++- theme/style.less | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pxtarget.json b/pxtarget.json index 5d6cb025..ba58a99a 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -289,8 +289,16 @@ ], "invertedMenu": true, "invertedToolbox": true, + "coloredToolbox": true, "simAnimationEnter": "rotate in", "simAnimationExit": "rotate out", - "blocklyOptions": { } + "blocklyOptions": { + "grid": { + "spacing": 45, + "length": 7, + "colour": "rgba(189, 195, 199, 0.30)", + "snap": false + } + } } } diff --git a/theme/style.less b/theme/style.less index 0d2ae3f9..8cc87b87 100644 --- a/theme/style.less +++ b/theme/style.less @@ -103,7 +103,7 @@ } /* Mobile */ -@media only screen and (max-width: @largestMobileScreen) { +@media only screen and (max-width: @largestMobileEditorBreakpoint) { .blocklyTreeLabel { font-size: 0.5rem !important; } @@ -113,7 +113,7 @@ } /* Tablet */ -@media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) { +@media only screen and (min-width: @tabletEditorBreakpoint) and (max-width: @largestTabletEditorBreakpoint) { .organization { top: auto; } @@ -125,7 +125,7 @@ } /* Small Monitor */ -@media only screen and (min-width: @computerBreakpoint) and (max-width: @largestSmallMonitor) { +@media only screen and (min-width: @computerEditorBreakpoint) and (max-width: @largestSmallMonitorEditorBreakpoint) { .organization { top: auto; } @@ -140,7 +140,7 @@ } /* Large Monitor */ -@media only screen and (min-width: @largeMonitorBreakpoint) { +@media only screen and (min-width: @largeMonitorEditorBreakpoint) { .blocklyTreeRow { width: 230px; } From 250e21b5c9fc07c586eea4d139e1f62634391f92 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 22:41:13 -0800 Subject: [PATCH 04/20] fixed toolbox color --- libs/bluetooth/_locales/bluetooth-jsdoc-strings.json | 2 +- libs/core/_locales/core-jsdoc-strings.json | 2 +- pxtarget.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json b/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json index ca3ba8ef..91ab16da 100644 --- a/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json +++ b/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json @@ -1,5 +1,5 @@ { - "bluetooth": "Support for additional Bluetooth services.", + "bluetooth": "Support for additional Bluetooth services.\n\nSupport for additional Bluetooth services.", "bluetooth.onBluetoothConnected": "Register code to run when the micro:bit is connected to over Bluetooth", "bluetooth.onBluetoothConnected|param|body": "Code to run when a Bluetooth connection is established", "bluetooth.onBluetoothDisconnected": "Register code to run when a bluetooth connection to the micro:bit is lost", diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json index fd0619b0..75227da1 100644 --- a/libs/core/_locales/core-jsdoc-strings.json +++ b/libs/core/_locales/core-jsdoc-strings.json @@ -26,7 +26,7 @@ "String.substr": "Return substring of the current string.", "String.substr|param|length": "number of characters to extract", "String.substr|param|start": "first character index; can be negative from counting from the end, eg:0", - "basic": "Provides access to basic micro:bit functionality.", + "basic": "Provides access to basic micro:bit functionality.\n\nProvides access to basic micro:bit functionality.", "basic.clearScreen": "Turn off all LEDs", "basic.color": "Converts the color name to a number", "basic.forever": "Repeats the code forever in the background. On each iteration, allows other codes to run.", diff --git a/pxtarget.json b/pxtarget.json index ba58a99a..3381fde9 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -289,7 +289,7 @@ ], "invertedMenu": true, "invertedToolbox": true, - "coloredToolbox": true, + "monacoToolbox": false, "simAnimationEnter": "rotate in", "simAnimationExit": "rotate out", "blocklyOptions": { From 14d50810cba8a79c57eb6380d0ffbf905c6e5e5f Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:12:43 -0800 Subject: [PATCH 05/20] Bump pxt-core to 0.7.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3d4fa70..fd655447 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.8" + "pxt-core": "0.7.9" } } From e95d29286ac3b7984791bf5b5f5ab9aeb431e52d Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:12:46 -0800 Subject: [PATCH 06/20] 0.7.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd655447..f0320b17 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.4", + "version": "0.7.5", "description": "calliope target for PXT", "keywords": [ "JavaScript", From 1e94e04104633d6054ae5406ab830ca726e83a35 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:17:39 -0800 Subject: [PATCH 07/20] setting up "on start" --- pxtarget.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pxtarget.json b/pxtarget.json index 3381fde9..7deca681 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -54,7 +54,9 @@ "mathBlocks": true, "loopsBlocks": true, "logicBlocks": true, - "variablesBlocks": true + "variablesBlocks": true, + "onStartColor": "#54C9C9", + "onStartNamespace": "basic" }, "simulator": { "autoRun": true, From 8ea9f1fb26f0bc52dcb2734bd51c417a5f09dcc5 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:18:00 -0800 Subject: [PATCH 08/20] 0.7.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0320b17..32102ebd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.5", + "version": "0.7.6", "description": "calliope target for PXT", "keywords": [ "JavaScript", From 6530bc26ae88d2431006dca1fe3cb12f13ffa825 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:24:53 -0800 Subject: [PATCH 09/20] fixing menu active css --- theme/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/style.less b/theme/style.less index 8cc87b87..585079a7 100644 --- a/theme/style.less +++ b/theme/style.less @@ -16,7 +16,7 @@ background: #4ECC60 !important; } -.blocks-menuitem, .javascript-menuitem { +.blocks-menuitem.active, .javascript-menuitem.active { background: #738791 !important; } From aeff3d9f4545467671cf94583d0bdd5da3358897 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 22 Dec 2016 23:25:06 -0800 Subject: [PATCH 10/20] 0.7.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32102ebd..a24efd63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.6", + "version": "0.7.7", "description": "calliope target for PXT", "keywords": [ "JavaScript", From d1902a83cabcbe69de1b8398dbe84a88d7619025 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 23 Dec 2016 00:22:32 -0800 Subject: [PATCH 11/20] bumped to v0.7.7 --- docs/index-ref.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index-ref.json b/docs/index-ref.json index 30add6bf..03d60be2 100644 --- a/docs/index-ref.json +++ b/docs/index-ref.json @@ -1,3 +1,3 @@ { - "appref": "v0.7.3" + "appref": "v0.7.7" } From dfbf06fc0e4ab3a8c730f65899175438b237c69c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 30 Dec 2016 13:50:38 -0800 Subject: [PATCH 12/20] Bump pxt-core to 0.7.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a24efd63..294c6585 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.9" + "pxt-core": "0.7.10" } } From 01c56e11116f43c8536e7cd5c6084083feafa3ab Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 30 Dec 2016 13:50:40 -0800 Subject: [PATCH 13/20] 0.7.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 294c6585..29bea9f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.7", + "version": "0.7.8", "description": "calliope target for PXT", "keywords": [ "JavaScript", From 8e1acfc7dff8f5ed0b0425262e24652270189080 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 30 Dec 2016 15:07:04 -0800 Subject: [PATCH 14/20] Bump pxt-core to 0.7.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29bea9f4..570f834e 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.10" + "pxt-core": "0.7.12" } } From 734e81f4be560c1c2111f6c0bdbcb41b97e8da07 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 30 Dec 2016 15:07:06 -0800 Subject: [PATCH 15/20] 0.7.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 570f834e..26fe4749 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.8", + "version": "0.7.9", "description": "calliope target for PXT", "keywords": [ "JavaScript", From ef6c3a6617bbe439770d44468683b3240359977c Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Sat, 31 Dec 2016 02:15:21 -0800 Subject: [PATCH 16/20] ui changes accompanying changes in pxt, converging where possible --- theme/style.less | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/theme/style.less b/theme/style.less index 585079a7..2b07785b 100644 --- a/theme/style.less +++ b/theme/style.less @@ -88,12 +88,16 @@ } /* Blockly Toolbox Buttons */ -#blocklyToolboxButtons .blocklyAddPackageButton { +.blocklyToolboxButtons .blocklyAddPackageButton { + &:extend(.ui.button all); + &:extend(.circular all); background-color: rgba(0, 0, 0, 0.3); color: white; } -#blocklyToolboxButtons .blocklyUndoButton { +.blocklyToolboxButtons .blocklyUndoButton { + &:extend(.ui.button all); + &:extend(.circular all); background-color: rgba(0, 0, 0, 0.3); color: white; } @@ -103,52 +107,22 @@ } /* Mobile */ -@media only screen and (max-width: @largestMobileEditorBreakpoint) { +@media only screen and (max-width: @largestMobileScreen) { .blocklyTreeLabel { font-size: 0.5rem !important; } - .organization { - top: auto; - } } /* Tablet */ -@media only screen and (min-width: @tabletEditorBreakpoint) and (max-width: @largestTabletEditorBreakpoint) { - .organization { - top: auto; - } - /* Blockly Toolbox buttons */ - #blocklyToolboxButtons { - margin-right: 0.5rem; - margin-left: 0.5rem; - } +@media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) { } /* Small Monitor */ -@media only screen and (min-width: @computerEditorBreakpoint) and (max-width: @largestSmallMonitorEditorBreakpoint) { - .organization { - top: auto; - } - .blocklyTreeRow { - width: 230px; - } - /* Blockly Toolbox buttons */ - #blocklyToolboxButtons { - margin-right: 1rem; - margin-left: 1rem; - } +@media only screen and (min-width: @computerBreakpoint) and (max-width: @largestSmallMonitor) { } /* Large Monitor */ -@media only screen and (min-width: @largeMonitorEditorBreakpoint) { - .blocklyTreeRow { - width: 230px; - } - /* Blockly Toolbox buttons */ - #blocklyToolboxButtons { - margin-right: 2rem; - margin-left: 2rem; - } +@media only screen and (min-width: @largeMonitorBreakpoint) { } /******************************* From 291ea7169f86ebbcbb4544b7913187e33ff282f4 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sat, 31 Dec 2016 06:50:05 -0800 Subject: [PATCH 17/20] Bump pxt-core to 0.7.13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26fe4749..014c12c0 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.12" + "pxt-core": "0.7.13" } } From 800682e8cc824a8654ee3790c98bb570abc348fd Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sat, 31 Dec 2016 06:50:07 -0800 Subject: [PATCH 18/20] 0.7.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 014c12c0..087e0db4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.7.9", + "version": "0.7.10", "description": "calliope target for PXT", "keywords": [ "JavaScript", From ef5bee5a21b222db8e486615a67160de4f929ab6 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 2 Jan 2017 18:59:39 -0800 Subject: [PATCH 19/20] Bump pxt-core to 0.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 087e0db4..ebdded6d 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.7.13" + "pxt-core": "0.8.1" } } From cc3c9664273b8de9243ca6f1c336424431d8ee48 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 2 Jan 2017 19:02:05 -0800 Subject: [PATCH 20/20] fixing typings --- cmds/pxtrequire.ts | 2 +- sim/instructions.ts | 2 +- sim/visuals/ledmatrix.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmds/pxtrequire.ts b/cmds/pxtrequire.ts index 227781fb..0eabce91 100644 --- a/cmds/pxtrequire.ts +++ b/cmds/pxtrequire.ts @@ -1,4 +1,4 @@ -/// +/// /// import * as path from "path"; diff --git a/sim/instructions.ts b/sim/instructions.ts index 23a0c1cc..21620483 100644 --- a/sim/instructions.ts +++ b/sim/instructions.ts @@ -1,4 +1,4 @@ -/// +/// /// /// diff --git a/sim/visuals/ledmatrix.ts b/sim/visuals/ledmatrix.ts index 70b11a3f..8614bb88 100644 --- a/sim/visuals/ledmatrix.ts +++ b/sim/visuals/ledmatrix.ts @@ -1,4 +1,4 @@ -/// +/// /// namespace pxsim.visuals {