From 9bc6d994a8980011d9c14ae3da4492ab133469cf Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Mon, 1 Oct 2018 14:39:51 -0700 Subject: [PATCH] Update block pallette slightly to more saturated colours in order to increase constrast between block color and stroke color (#1323) --- libs/bluetooth/bluetooth.ts | 2 +- libs/core/basic.cpp | 2 +- libs/core/game.ts | 2 +- libs/core/images.cpp | 2 +- libs/core/input.cpp | 2 +- libs/core/led.cpp | 2 +- libs/core/music.ts | 2 +- libs/core/pins.ts | 2 +- libs/core/shims.d.ts | 8 ++++---- libs/radio/radio.ts | 2 +- pxtarget.json | 12 +++++++++++- 11 files changed, 24 insertions(+), 14 deletions(-) diff --git a/libs/bluetooth/bluetooth.ts b/libs/bluetooth/bluetooth.ts index 343f24ba..5c5ccd82 100644 --- a/libs/bluetooth/bluetooth.ts +++ b/libs/bluetooth/bluetooth.ts @@ -1,7 +1,7 @@ /** * Support for additional Bluetooth services. */ -//% color=#0082FB weight=96 icon="\uf294" +//% color=#007EF4 weight=96 icon="\uf294" namespace bluetooth { /** * Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device. diff --git a/libs/core/basic.cpp b/libs/core/basic.cpp index e4eaf8f4..ef7f7783 100644 --- a/libs/core/basic.cpp +++ b/libs/core/basic.cpp @@ -4,7 +4,7 @@ /** * Provides access to basic micro:bit functionality. */ -//% color=#0078D7 weight=116 icon="\uf00a" +//% color=#1E90FF weight=116 icon="\uf00a" namespace basic { /** diff --git a/libs/core/game.ts b/libs/core/game.ts index d07b3d2a..e39b50a0 100644 --- a/libs/core/game.ts +++ b/libs/core/game.ts @@ -21,7 +21,7 @@ enum LedSpriteProperty { /** * A single-LED sprite game engine */ -//% color=#008272 weight=32 icon="\uf11b" +//% color=#007A4B weight=32 icon="\uf11b" //% advanced=true namespace game { let _score: number = 0; diff --git a/libs/core/images.cpp b/libs/core/images.cpp index 309fcd9b..60d83c65 100644 --- a/libs/core/images.cpp +++ b/libs/core/images.cpp @@ -25,7 +25,7 @@ void RefMImage::makeWritable() { /** * Creation, manipulation and display of LED images. */ -//% color=#5C2D91 weight=31 icon="\uf03e" +//% color=#7600A8 weight=31 icon="\uf03e" //% advanced=true namespace images { /** diff --git a/libs/core/input.cpp b/libs/core/input.cpp index 7cb54c4c..7b7dc524 100644 --- a/libs/core/input.cpp +++ b/libs/core/input.cpp @@ -158,7 +158,7 @@ enum class MesDpadButtonInfo { _4Up = MES_DPAD_BUTTON_4_UP, }; -//% color=#B4009E weight=111 icon="\uf192" +//% color=#D400D4 weight=111 icon="\uf192" namespace input { /** * Do something when a button (A, B or both A+B) is pushed down and released again. diff --git a/libs/core/led.cpp b/libs/core/led.cpp index 0ae36e0b..5a5b9621 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=#5C2D91 weight=101 icon="\uf205" +//% color=#7600A8 weight=101 icon="\uf205" namespace led { /** diff --git a/libs/core/music.ts b/libs/core/music.ts index 56824087..38eec26d 100644 --- a/libs/core/music.ts +++ b/libs/core/music.ts @@ -163,7 +163,7 @@ enum MusicEvent { /** * Generation of music tones. */ -//% color=#D83B01 weight=106 icon="\uf025" +//% color=#E63022 weight=106 icon="\uf025" namespace music { let beatsPerMinute: number = 120; let freqTable: number[] = []; diff --git a/libs/core/pins.ts b/libs/core/pins.ts index aee682d4..8182af1d 100644 --- a/libs/core/pins.ts +++ b/libs/core/pins.ts @@ -1,7 +1,7 @@ /** * Control currents in Pins for analog/digital signals, servos, i2c, ... */ -//% color=#A80000 weight=30 icon="\uf140" +//% color=#B22222 weight=30 icon="\uf140" //% advanced=true namespace pins { /** diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index cdba8f02..59ae620b 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -4,7 +4,7 @@ /** * Creation, manipulation and display of LED images. */ - //% color=#5C2D91 weight=31 icon="\uf03e" + //% color=#7600A8 weight=31 icon="\uf03e" //% advanced=true declare namespace images { @@ -127,7 +127,7 @@ declare interface Image { /** * Provides access to basic micro:bit functionality. */ - //% color=#0078D7 weight=116 icon="\uf00a" + //% color=#1E90FF weight=116 icon="\uf00a" declare namespace basic { /** @@ -203,7 +203,7 @@ declare namespace basic { - //% color=#B4009E weight=111 icon="\uf192" + //% color=#D400D4 weight=111 icon="\uf192" declare namespace input { /** @@ -435,7 +435,7 @@ declare namespace control { - //% color=#5C2D91 weight=101 icon="\uf205" + //% color=#7600A8 weight=101 icon="\uf205" declare namespace led { /** diff --git a/libs/radio/radio.ts b/libs/radio/radio.ts index a0f5e607..43ddb6d1 100644 --- a/libs/radio/radio.ts +++ b/libs/radio/radio.ts @@ -1,7 +1,7 @@ /** * Communicate data using radio packets */ -//% color=#E3008C weight=96 icon="\uf012" +//% color=#F62459 weight=96 icon="\uf012" namespace radio { export class Packet { /** diff --git a/pxtarget.json b/pxtarget.json index e0f8f034..79452bb0 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -101,7 +101,7 @@ "textBlocks": true, "listsBlocks": true, "functionBlocks": true, - "onStartColor": "#0078D7", + "onStartColor": "#1E90FF", "onStartNamespace": "basic", "onStartWeight": 54 }, @@ -377,6 +377,16 @@ "snap": false } }, + "blockColors": { + "logic": "#00A4A6", + "loops": "#00AA00", + "math": "#9400D3", + "variables": "#DC143C", + "text": "#B8860B", + "advanced": "#00272B", + "functions": "#3455DB", + "arrays": "#E65722" + }, "highContrast": true, "greenScreen": false, "selectLanguage": true,