Merge branch 'master' of github.com:microsoft/pxt-calliope

cmds/pxtrequire.ts

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

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v0.7.3"
+    "appref": "v0.7.7"
 }

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",

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.",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-calliope",
-  "version": "0.7.3",
+  "version": "0.7.10",
   "description": "calliope target for PXT",
   "keywords": [
     "JavaScript",
@@ -34,6 +34,6 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.7.5"
+    "pxt-core": "0.8.1"
   }
 }

pxtarget.json

@@ -54,7 +54,9 @@
         "mathBlocks": true,
         "loopsBlocks": true,
         "logicBlocks": true,
-        "variablesBlocks": true
+        "variablesBlocks": true,
+        "onStartColor": "#54C9C9",
+        "onStartNamespace": "basic"
     },
     "simulator": {
         "autoRun": true,
@@ -289,8 +291,16 @@
         ],
         "invertedMenu": true,
         "invertedToolbox": true,
+        "monacoToolbox": false,
         "simAnimationEnter": "rotate in",
         "simAnimationExit": "rotate out",
-        "blocklyOptions": { }
+        "blocklyOptions": { 
+            "grid": {
+                "spacing": 45,
+                "length": 7,
+                "colour": "rgba(189, 195, 199, 0.30)",
+                "snap": false
+            }
+        }
     }
 }

sim/instructions.ts

@@ -1,4 +1,4 @@
-/// <reference path="../node_modules/pxt-core/typings/bluebird/bluebird.d.ts"/>
+/// <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/pxtrunner.d.ts"/>
 

sim/visuals/ledmatrix.ts

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

theme/style.less

@@ -16,7 +16,7 @@
     background: #4ECC60 !important;
 }
 
-.blocks-menuitem, .javascript-menuitem {
+.blocks-menuitem.active, .javascript-menuitem.active {
     background: #738791 !important;
 }
 
@@ -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;
 }
@@ -107,48 +111,18 @@
     .blocklyTreeLabel {
         font-size: 0.5rem !important;
     }
-    .organization {
-        top: auto;
-    }
 }
 
 /* Tablet */
 @media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) {
-    .organization {
-        top: auto;
-    }
-    /* Blockly Toolbox buttons */
-    #blocklyToolboxButtons {
-        margin-right: 0.5rem;
-        margin-left: 0.5rem;
-    }
 }
 
 /* Small Monitor */
 @media only screen and (min-width: @computerBreakpoint) and (max-width: @largestSmallMonitor) {
-    .organization {
-        top: auto;
-    }
-    .blocklyTreeRow {
-        width: 230px;
-    }
-    /* Blockly Toolbox buttons */
-    #blocklyToolboxButtons {
-        margin-right: 1rem;
-        margin-left: 1rem;
-    }
 }
 
 /* Large Monitor */
 @media only screen and (min-width: @largeMonitorBreakpoint) {
-    .blocklyTreeRow {
-        width: 230px;
-    }
-    /* Blockly Toolbox buttons */
-    #blocklyToolboxButtons {
-        margin-right: 2rem;
-        margin-left: 2rem;
-    }
 }
 
 /*******************************