diff --git a/docs/static/blockly/media/1x1.gif b/docs/static/blockly/media/1x1.gif new file mode 100644 index 00000000..30855112 Binary files /dev/null and b/docs/static/blockly/media/1x1.gif differ diff --git a/docs/static/blockly/media/click.mp3 b/docs/static/blockly/media/click.mp3 new file mode 100644 index 00000000..4534b0dd Binary files /dev/null and b/docs/static/blockly/media/click.mp3 differ diff --git a/docs/static/blockly/media/click.ogg b/docs/static/blockly/media/click.ogg new file mode 100644 index 00000000..e8ae42a6 Binary files /dev/null and b/docs/static/blockly/media/click.ogg differ diff --git a/docs/static/blockly/media/click.wav b/docs/static/blockly/media/click.wav new file mode 100644 index 00000000..41a50cd7 Binary files /dev/null and b/docs/static/blockly/media/click.wav differ diff --git a/docs/static/blockly/media/delete.mp3 b/docs/static/blockly/media/delete.mp3 new file mode 100644 index 00000000..442bd9c1 Binary files /dev/null and b/docs/static/blockly/media/delete.mp3 differ diff --git a/docs/static/blockly/media/delete.ogg b/docs/static/blockly/media/delete.ogg new file mode 100644 index 00000000..67f84ac1 Binary files /dev/null and b/docs/static/blockly/media/delete.ogg differ diff --git a/docs/static/blockly/media/delete.wav b/docs/static/blockly/media/delete.wav new file mode 100644 index 00000000..18debcf9 Binary files /dev/null and b/docs/static/blockly/media/delete.wav differ diff --git a/docs/static/blockly/media/disconnect.mp3 b/docs/static/blockly/media/disconnect.mp3 new file mode 100644 index 00000000..8cfaff6c Binary files /dev/null and b/docs/static/blockly/media/disconnect.mp3 differ diff --git a/docs/static/blockly/media/disconnect.ogg b/docs/static/blockly/media/disconnect.ogg new file mode 100644 index 00000000..467b527b Binary files /dev/null and b/docs/static/blockly/media/disconnect.ogg differ diff --git a/docs/static/blockly/media/disconnect.wav b/docs/static/blockly/media/disconnect.wav new file mode 100644 index 00000000..af5c2544 Binary files /dev/null and b/docs/static/blockly/media/disconnect.wav differ diff --git a/docs/static/blockly/media/handclosed.cur b/docs/static/blockly/media/handclosed.cur new file mode 100644 index 00000000..4851755a Binary files /dev/null and b/docs/static/blockly/media/handclosed.cur differ diff --git a/docs/static/blockly/media/handdelete.cur b/docs/static/blockly/media/handdelete.cur new file mode 100644 index 00000000..170320fc Binary files /dev/null and b/docs/static/blockly/media/handdelete.cur differ diff --git a/docs/static/blockly/media/handopen.cur b/docs/static/blockly/media/handopen.cur new file mode 100644 index 00000000..da44588b Binary files /dev/null and b/docs/static/blockly/media/handopen.cur differ diff --git a/docs/static/blockly/media/quote0.png b/docs/static/blockly/media/quote0.png new file mode 100644 index 00000000..b2fd10f6 Binary files /dev/null and b/docs/static/blockly/media/quote0.png differ diff --git a/docs/static/blockly/media/quote1.png b/docs/static/blockly/media/quote1.png new file mode 100644 index 00000000..826583e0 Binary files /dev/null and b/docs/static/blockly/media/quote1.png differ diff --git a/docs/static/blockly/media/sprites.png b/docs/static/blockly/media/sprites.png new file mode 100644 index 00000000..fcc77985 Binary files /dev/null and b/docs/static/blockly/media/sprites.png differ diff --git a/docs/static/blockly/media/sprites.svg b/docs/static/blockly/media/sprites.svg new file mode 100644 index 00000000..e6ff5475 --- /dev/null +++ b/docs/static/blockly/media/sprites.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + ✓ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/core/basic.cpp b/libs/core/basic.cpp index 74cbdae5..d4306513 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=100 +//% color=#54C9C9 weight=100 namespace basic { /** * Sets the color on the build-in LED. Set to 0 to turn off. diff --git a/libs/core/basic.ts b/libs/core/basic.ts index 636b2a35..b0c881e0 100644 --- a/libs/core/basic.ts +++ b/libs/core/basic.ts @@ -34,7 +34,7 @@ enum Colors { /** * Provides access to basic micro:bit functionality. */ -//% color=#0078D7 weight=100 +//% color=#54C9C9 weight=100 namespace basic { /** * Converts the color name to a number diff --git a/libs/core/control.ts b/libs/core/control.ts index d9cd8f75..1245beb6 100644 --- a/libs/core/control.ts +++ b/libs/core/control.ts @@ -1,7 +1,7 @@ /** * Runtime and event utilities. */ -//% weight=1 color="#333333" +//% weight=1 color="#42495F" //% advanced=true namespace control { diff --git a/libs/core/input.cpp b/libs/core/input.cpp index c8c0b181..4424e4c8 100644 --- a/libs/core/input.cpp +++ b/libs/core/input.cpp @@ -108,7 +108,7 @@ enum class Gesture { SixG = MICROBIT_ACCELEROMETER_EVT_6G }; -//% color=300 weight=99 +//% color=#C90072 weight=99 namespace input { /** * Do something when a button (``A``, ``B`` or both ``A+B``) is pressed diff --git a/libs/core/input.ts b/libs/core/input.ts index d54aa37f..8cb992c4 100644 --- a/libs/core/input.ts +++ b/libs/core/input.ts @@ -1,7 +1,7 @@ /** * Events and data from sensors */ -//% color=#B4009E weight=99 +//% color=#C90072 weight=99 namespace input { /** * Attaches code to run when the screen is facing up. diff --git a/libs/core/led.cpp b/libs/core/led.cpp index 029fc1bf..c6ad0989 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 +//% color=#8169E6 weight=35 namespace led { /** diff --git a/libs/core/led.ts b/libs/core/led.ts index b7621efb..ecf77ca6 100644 --- a/libs/core/led.ts +++ b/libs/core/led.ts @@ -1,7 +1,7 @@ /** * Control of the LED screen. */ -//% color=#5C2D91 weight=97 +//% color=#8169E6 weight=97 namespace led { // what's the current high value diff --git a/libs/core/motors.cpp b/libs/core/motors.cpp index 2a2366f3..94ae562c 100644 --- a/libs/core/motors.cpp +++ b/libs/core/motors.cpp @@ -3,7 +3,7 @@ /** * Blocks to control the onboard motors */ -//% weight=30 +//% color=#008272 weight=30 namespace motors { /** * Controls the power sent to a single motor diff --git a/libs/core/music.ts b/libs/core/music.ts index 3d26116b..6b00e668 100644 --- a/libs/core/music.ts +++ b/libs/core/music.ts @@ -125,7 +125,7 @@ enum BeatFraction { /** * Generation of music tones through pin ``P0``. */ -//% color=#D83B01 weight=98 +//% color=#DF4600 weight=98 namespace music { let beatsPerMinute: number = 120; diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index 46185bfb..310d3cb2 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -126,7 +126,7 @@ declare interface Image { /** * Provides access to basic micro:bit functionality. */ - //% color=#0078D7 weight=100 + //% color=#54C9C9 weight=100 declare namespace basic { /** @@ -218,7 +218,7 @@ declare namespace basic { - //% color=300 weight=99 + //% color=#C90072 weight=99 declare namespace input { /** @@ -432,7 +432,7 @@ declare namespace control { - //% color=3 weight=35 + //% color=#8169E6 weight=35 declare namespace led { /** @@ -513,7 +513,7 @@ declare namespace led { /** * Blocks to control the onboard motors */ - //% weight=30 + //% color=#008272 weight=30 declare namespace motors { /** diff --git a/pxtarget.json b/pxtarget.json index f8e7e683..2be3bf68 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -219,8 +219,6 @@ }, "appTheme": { "accentColor": "#249899", - "downloadClass": "orange", - "invertedMenu": true, "defaultLocale": "de", "logoUrl": "https://calliope.cc/about", "logo": "./static/Calliopeminieditor.svg", @@ -350,6 +348,12 @@ "browser": "*", "path": "/static/mb/device/usb-windows-sendto.jpg" } - ] + ], + "invertedMenu": true, + "invertedToolbox": true, + "blocklyOptions": { + "media": "./static/blockly/media/", + "trashcan": true + } } } diff --git a/theme/site/collections/menu.variables b/theme/site/collections/menu.variables index 6f085f93..3724da6c 100644 --- a/theme/site/collections/menu.variables +++ b/theme/site/collections/menu.variables @@ -1,3 +1,13 @@ /******************************* User Variable Overrides *******************************/ + +@invertedBackground: #525A67; +@dropdownMenuDistance: 0px; + +/******************************* + PXT Theme Overrides +*******************************/ + +@mainMenuHeight: 5rem; +@mainMenuMinHeight: (@itemVerticalPadding * 2) + 2em; \ No newline at end of file diff --git a/theme/site/elements/input.overrides b/theme/site/elements/input.overrides index cba59efe..95423510 100644 --- a/theme/site/elements/input.overrides +++ b/theme/site/elements/input.overrides @@ -1,3 +1,15 @@ /******************************* Site Overrides *******************************/ + +.ui.inverted.input input { + background:#424852; + border-radius: 20px; + border: 0px !important; + padding: 0.2em !important; + padding-left: 0.6em !important; +} + +.rtl .ui.inverted.input input { + padding-right: 0.6em !important; +} \ No newline at end of file diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables index 31a2b338..78c641e1 100644 --- a/theme/site/globals/site.variables +++ b/theme/site/globals/site.variables @@ -7,13 +7,20 @@ @secondaryColor: #43C9C9; @red:#E81123; -@orange:#D78C01; -@yellow:#EEDA47; +@orange:#DF4600; +@yellow:#F4C918; @green:#3FC863; @teal:#008272; -@blue:#0078D7; -@violet:#CF0071; -@purple:#8073E5; +@blue:#54C9C9; +@violet:#C90072; +@purple:#8169E6; @pink:#E2008C; @brown:#6B5B4C; -@grey:#515B67; +@grey:#42495F; + +/******************************* + PXT Overrides +*******************************/ + +@backgroundColor: #FDFDFA; +@blocklyToolboxColor: #F6F4E6; \ No newline at end of file diff --git a/theme/style.less b/theme/style.less index 959ecee7..e9f42eb1 100644 --- a/theme/style.less +++ b/theme/style.less @@ -1,2 +1,81 @@ /* Import all components */ @import 'semantic'; +@import 'themes/default/globals/site.variables'; +@import 'themes/pxt/globals/site.variables'; +@import 'site/globals/site.variables'; + +/* Reference import */ +@import (reference) "semantic.less"; + +.openproject { + background: #4ECC60 !important; +} + +.blocks-menuitem, .javascript-menuitem { + background: #738791 !important; +} + +.help-dropdown-menuitem, .more-dropdown-menuitem { + background: #424955 !important; + margin-right:0px !important; +} + +.play-button { + &:extend(.ui all); + &:extend(.button all); + &:extend(.blue all); +} + +.download-button { + &:extend(.ui all); + &:extend(.button all); + &:extend(.yellow all); +} + +/* This removes the margin between the blockly categories to form connected pills */ +.blocklyTreeRow { + width: 230px; + border-radius:5px; +} + +/* This removes any padding at the top of the toolbox */ +.blocklyTreeRoot { + padding: 0px !important; +} + +/* Blockly Text */ +.blocklyTreeLabel { + font-family: "Gotham SSm A","Gotham SSm B","Montserrat","Lucida Grande","Lucida Sans Unicode","Lucida Sans",Geneva,Verdana,sans-serif !important; +} + +.blocklyTreeLabel { + font-size:1rem !important; +} + +.blocklyFlyoutBackground { + fill: #FDFDE2; +} + +.blocklyToolboxDiv { + /*left:30px !important;*/ + padding:7px; +} + +@media only screen and (max-width: @largestMobileScreen) { + .blocklyTreeLabel { + font-size: 0.5rem !important; + } +} + + +/******************************* + Menu Bar +*******************************/ + +#menubar { + height: 5rem; +} + +#fileNameInput { + width: 350px; +} \ No newline at end of file