From 0d4af4ea122a28573a86a7af6d16fd7947f73519 Mon Sep 17 00:00:00 2001 From: Richard Knoll Date: Mon, 27 Feb 2017 15:26:45 -0800 Subject: [PATCH] Fixing colors --- libs/core/input.cpp | 4 ++-- libs/core/led.cpp | 4 ++-- libs/core/serial.cpp | 2 +- libs/core/shims.d.ts | 8 ++++---- pxtarget.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/core/input.cpp b/libs/core/input.cpp index 31631499..457f9aa4 100644 --- a/libs/core/input.cpp +++ b/libs/core/input.cpp @@ -112,7 +112,7 @@ enum class Gesture { EightG = MICROBIT_ACCELEROMETER_EVT_8G }; -//% color=300 weight=99 icon="\uf192" +//% color=#B4009E weight=99 icon="\uf192" namespace input { /** * Do something when a button (``A``, ``B`` or both ``A+B``) is pressed @@ -212,7 +212,7 @@ namespace input { double y = uBit.accelerometer.getY(); double z = uBit.accelerometer.getZ(); return (int)sqrt(x*x+y*y+z*z); - } + } /** * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024) diff --git a/libs/core/led.cpp b/libs/core/led.cpp index 24789928..b02c0c15 100644 --- a/libs/core/led.cpp +++ b/libs/core/led.cpp @@ -8,7 +8,7 @@ enum class DisplayMode_ { // TODO DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE }; -//% color=3 weight=35 icon="\uf205" +//% color=#5C2D91 weight=97 icon="\uf205" namespace led { /** @@ -93,7 +93,7 @@ namespace led { } /** - * Turns on or off the display + * Turns on or off the display */ //% help=led/enable blockId=device_led_enable block="led enable %on" //% advanced=true parts="ledmatrix" diff --git a/libs/core/serial.cpp b/libs/core/serial.cpp index 2792fdd6..2d537840 100644 --- a/libs/core/serial.cpp +++ b/libs/core/serial.cpp @@ -34,7 +34,7 @@ enum Delimiters { Hash = 6, }; -//% weight=2 color=30 icon="\uf287" +//% weight=2 color=#002050 icon="\uf287" //% advanced=true namespace serial { // note that at least one // followed by % is needed per declaration! diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index 7697ff41..0f42a14c 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -212,7 +212,7 @@ declare namespace basic { - //% color=300 weight=99 icon="\uf192" + //% color=#B4009E weight=99 icon="\uf192" declare namespace input { /** @@ -430,7 +430,7 @@ declare namespace control { - //% color=3 weight=35 icon="\uf205" + //% color=#5C2D91 weight=97 icon="\uf205" declare namespace led { /** @@ -500,7 +500,7 @@ declare namespace led { function setDisplayMode(mode: DisplayMode): void; /** - * Turns on or off the display + * Turns on or off the display */ //% help=led/enable blockId=device_led_enable block="led enable %on" //% advanced=true parts="ledmatrix" shim=led::enable @@ -671,7 +671,7 @@ declare namespace pins { - //% weight=2 color=30 icon="\uf287" + //% weight=2 color=#002050 icon="\uf287" //% advanced=true declare namespace serial { diff --git a/pxtarget.json b/pxtarget.json index 41e82429..1ccb1ce6 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -333,7 +333,7 @@ "coloredToolbox": true, "monacoToolbox": true, "hasAudio": true, - "blocklyOptions": { + "blocklyOptions": { "grid": { "spacing": 45, "length": 7,