diff --git a/docs/static/fonts/icons/iconfont.css b/docs/static/fonts/icons/iconfont.css index 82dabf4a..1bfee515 100644 --- a/docs/static/fonts/icons/iconfont.css +++ b/docs/static/fonts/icons/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; - src: url("iconfont.eot?73552ec404b3a3d3769a3f04fa58c2c4?#iefix") format("embedded-opentype"), -url("iconfont.woff2?73552ec404b3a3d3769a3f04fa58c2c4") format("woff2"), -url("iconfont.woff?73552ec404b3a3d3769a3f04fa58c2c4") format("woff"); + src: url("iconfont.eot?8b7e57577c2d1f1ae9e810b9e010bc84?#iefix") format("embedded-opentype"), +url("iconfont.woff2?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff2"), +url("iconfont.woff?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff"); } .icon { @@ -67,24 +67,27 @@ url("iconfont.woff?73552ec404b3a3d3769a3f04fa58c2c4") format("woff"); .icon-variables:before { content: "\f111"; } -.icon-advancedcollapsed:before { +.icon-console:before { content: "\f112"; } -.icon-advancedexpanded:before { +.icon-advancedcollapsed:before { content: "\f113"; } -.icon-cancel:before { +.icon-advancedexpanded:before { content: "\f114"; } -.icon-check:before { +.icon-cancel:before { content: "\f115"; } -.icon-download:before { +.icon-check:before { content: "\f116"; } -.icon-save:before { +.icon-download:before { content: "\f117"; } -.icon-blocks:before { +.icon-save:before { content: "\f118"; } +.icon-blocks:before { + content: "\f119"; +} diff --git a/docs/static/fonts/icons/iconfont.eot b/docs/static/fonts/icons/iconfont.eot index 7a3f68f8..9ae2f1cd 100644 Binary files a/docs/static/fonts/icons/iconfont.eot and b/docs/static/fonts/icons/iconfont.eot differ diff --git a/docs/static/fonts/icons/iconfont.svg b/docs/static/fonts/icons/iconfont.svg index d9d0ae5f..9d8e10ae 100644 --- a/docs/static/fonts/icons/iconfont.svg +++ b/docs/static/fonts/icons/iconfont.svg @@ -58,26 +58,29 @@ - + diff --git a/docs/static/fonts/icons/iconfont.ttf b/docs/static/fonts/icons/iconfont.ttf index b1736ed9..aa6ad7c2 100644 Binary files a/docs/static/fonts/icons/iconfont.ttf and b/docs/static/fonts/icons/iconfont.ttf differ diff --git a/docs/static/fonts/icons/iconfont.woff b/docs/static/fonts/icons/iconfont.woff index a42d46c1..cb484789 100644 Binary files a/docs/static/fonts/icons/iconfont.woff and b/docs/static/fonts/icons/iconfont.woff differ diff --git a/docs/static/fonts/icons/iconfont.woff2 b/docs/static/fonts/icons/iconfont.woff2 index 5871c255..2e500895 100644 Binary files a/docs/static/fonts/icons/iconfont.woff2 and b/docs/static/fonts/icons/iconfont.woff2 differ diff --git a/libs/core/console.ts b/libs/core/console.ts index 70aa626e..dc911e8b 100644 --- a/libs/core/console.ts +++ b/libs/core/console.ts @@ -3,7 +3,7 @@ /** * Reading and writing data to the console output. */ -//% weight=12 color=#002050 icon="\uf120" +//% weight=12 color=#00451A icon="\uf112" //% advanced=true namespace console { type Listener = (text: string) => void; diff --git a/svgicons/categories/console.svg b/svgicons/categories/console.svg new file mode 100644 index 00000000..67f99654 --- /dev/null +++ b/svgicons/categories/console.svg @@ -0,0 +1,58 @@ + + + +image/svg+xmlcolorcolor \ No newline at end of file diff --git a/svgicons/generateIcons.js b/svgicons/generateIcons.js index 81d336a6..95debe97 100644 --- a/svgicons/generateIcons.js +++ b/svgicons/generateIcons.js @@ -19,6 +19,7 @@ webfontsGenerator({ "./categories/sensors.svg", "./categories/text.svg", "./categories/variables.svg", + "./categories/console.svg", "./categories/advancedcollapsed.svg", "./categories/advancedexpanded.svg", "./icons/cancel.svg", diff --git a/theme/blockly.less b/theme/blockly.less index a6b8d76b..702f1cdb 100644 --- a/theme/blockly.less +++ b/theme/blockly.less @@ -53,7 +53,6 @@ div.blocklyTreeSeparator { /* Blockly Text */ span.blocklyTreeLabel { font-family: @pageFont !important; - text-transform: uppercase !important; font-size:1rem !important; font-weight: bold; } @@ -118,34 +117,34 @@ span.blocklyTreeIcon.blocklyTreeIconaddpackage::before { } span.blocklyTreeIcon.blocklyTreeIconadvancedcollapsed::before { - content: "\f112"; + content: "\f113"; } span.blocklyTreeIcon.blocklyTreeIconadvancedexpanded::before { - content: "\f113"; + content: "\f114"; } .save-editortools-btn .icon.save:before { font-family: 'legoIcons'; - content: "\f117"; + content: "\f118"; } .download-button .icon.download.icon-and-text:before { font-family: 'legoIcons'; - content: "\f116"; + content: "\f117"; } .button.approve.positive i.icon.checkmark:before { font-family: 'legoIcons'; - content: "\f115"; + content: "\f116"; } .button.approve.cancel i.icon.cancel:before { font-family: 'legoIcons'; - content: "\f114"; + content: "\f115"; } .blocks-menuitem i.icon.blocks:before { font-family: 'legoIcons' !important; - content: "\f118" !important; + content: "\f119" !important; } diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables index 7366f297..85f9bfa1 100644 --- a/theme/site/globals/site.variables +++ b/theme/site/globals/site.variables @@ -132,7 +132,7 @@ Full screen --------------------*/ -@fullscreenBackgroundGradientStart: @blue; +@fullscreenBackgroundGradientStart: #fff; @fullscreenBackgroundGradientEnd: #fff; /*------------------- @@ -170,6 +170,6 @@ --------------------*/ @flyoutLabelColor: white; -@blocklyFlyoutColor: #282828; -@blocklyFlyoutColorOpacity: 0.9; -@monacoFlyoutColor: rgba(40, 40, 40,0.9); +@blocklyFlyoutColor: #3B3C3D; +@blocklyFlyoutColorOpacity: 1.0; +@monacoFlyoutColor: rgba(59, 60, 61, 1.0);