diff --git a/docs/static/fonts/icons/iconfont.css b/docs/static/fonts/icons/iconfont.css index f81b9f9f..4d0488f8 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?e05611aaee246c1da118a83eaf515de9?#iefix") format("embedded-opentype"), -url("iconfont.woff2?e05611aaee246c1da118a83eaf515de9") format("woff2"), -url("iconfont.woff?e05611aaee246c1da118a83eaf515de9") format("woff"); + src: url("iconfont.eot?8d461ad14fbdc5b48a8749a696d345dd?#iefix") format("embedded-opentype"), +url("iconfont.woff2?8d461ad14fbdc5b48a8749a696d345dd") format("woff2"), +url("iconfont.woff?8d461ad14fbdc5b48a8749a696d345dd") format("woff"); } .icon { @@ -28,3 +28,60 @@ url("iconfont.woff?e05611aaee246c1da118a83eaf515de9") format("woff"); .icon-gyro:before { content: "\f104"; } +.icon-addpackage:before { + content: "\f105"; +} +.icon-brick:before { + content: "\f106"; +} +.icon-controls:before { + content: "\f107"; +} +.icon-functions:before { + content: "\f108"; +} +.icon-list:before { + content: "\f109"; +} +.icon-logic:before { + content: "\f10a"; +} +.icon-loops:before { + content: "\f10b"; +} +.icon-math:before { + content: "\f10c"; +} +.icon-motors:before { + content: "\f10d"; +} +.icon-music:before { + content: "\f10e"; +} +.icon-sensors:before { + content: "\f10f"; +} +.icon-text:before { + content: "\f110"; +} +.icon-variables:before { + content: "\f111"; +} +.icon-cancel:before { + content: "\f112"; +} +.icon-check:before { + content: "\f113"; +} +.icon-download:before { + content: "\f114"; +} +.icon-save:before { + content: "\f115"; +} +.icon-advancedcollapsed:before { + content: "\f116"; +} +.icon-advancedexpanded:before { + content: "\f117"; +} diff --git a/docs/static/fonts/icons/iconfont.eot b/docs/static/fonts/icons/iconfont.eot index e4aa0b6d..5213c0ee 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 36778eab..f6fd85f3 100644 --- a/docs/static/fonts/icons/iconfont.svg +++ b/docs/static/fonts/icons/iconfont.svg @@ -19,6 +19,63 @@ + + + + + + + + + + + + + + + + + + + diff --git a/docs/static/fonts/icons/iconfont.ttf b/docs/static/fonts/icons/iconfont.ttf index 1eb7bf3d..09f962a4 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 ab8f84de..c055ec95 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 a27e0d1f..ba22a5b8 100644 Binary files a/docs/static/fonts/icons/iconfont.woff2 and b/docs/static/fonts/icons/iconfont.woff2 differ diff --git a/libs/ev3/ns.ts b/libs/ev3/ns.ts index 31a7b1f0..32690ba1 100644 --- a/libs/ev3/ns.ts +++ b/libs/ev3/ns.ts @@ -1,19 +1,19 @@ -//% color="#68C3E2" weight=100 +//% color="#68C3E2" weight=100 icon="\uf106" //% groups='["Buttons", "Screen"]' //% labelLineWidth=0 namespace brick { } -//% color="#C8509B" weight=95 icon="\uf192" +//% color="#C8509B" weight=95 icon="\uf10f" //% labelLineWidth=0 //% groups='["Ultrasonic Sensor", "Touch Sensor", "Color Sensor", "Infrared Sensor", "Remote Infrared Beacon", "Gyro Sensor"]' //% groupIcons='["\uf101","\uf103","\uf102","","","\uf104"]' namespace sensors { } -//% color="#A5CA18" weight=90 icon="\uf185" +//% color="#A5CA18" weight=90 icon="\uf10d" //% groups='["Motion", "Sensors", "Chassis"]' //% labelLineWidth=0 namespace motors { diff --git a/svgicons/categories/addpackage.svg b/svgicons/categories/addpackage.svg index 20d6e3e2..4c790989 100644 --- a/svgicons/categories/addpackage.svg +++ b/svgicons/categories/addpackage.svg @@ -9,15 +9,7 @@ color - - - - - - - - - - + diff --git a/svgicons/categories/advancedcollapsed.svg b/svgicons/categories/advancedcollapsed.svg index 087e876a..0a196c1d 100644 --- a/svgicons/categories/advancedcollapsed.svg +++ b/svgicons/categories/advancedcollapsed.svg @@ -6,18 +6,5 @@ .st0{fill:#FFFFFF;} color - - - - - - - - - - - - - - + diff --git a/svgicons/categories/advancedexpanded.svg b/svgicons/categories/advancedexpanded.svg index f4b42b1b..6a94d2fd 100644 --- a/svgicons/categories/advancedexpanded.svg +++ b/svgicons/categories/advancedexpanded.svg @@ -6,18 +6,5 @@ .st0{fill:#FFFFFF;} color - - - - - - - - - - - - - - + diff --git a/svgicons/categories/functions.svg b/svgicons/categories/functions.svg index cb203a8d..734e230e 100644 --- a/svgicons/categories/functions.svg +++ b/svgicons/categories/functions.svg @@ -7,25 +7,24 @@ color - - - - + + + + diff --git a/svgicons/categories/loops.svg b/svgicons/categories/loops.svg index 24816050..bb84f3f5 100644 --- a/svgicons/categories/loops.svg +++ b/svgicons/categories/loops.svg @@ -7,10 +7,11 @@ color - - + + diff --git a/svgicons/categories/math.svg b/svgicons/categories/math.svg index 683a445d..55154015 100644 --- a/svgicons/categories/math.svg +++ b/svgicons/categories/math.svg @@ -8,12 +8,12 @@ color - - - - - + + + + + diff --git a/svgicons/categories/sensors.svg b/svgicons/categories/sensors.svg index 7058572b..db63e3c4 100644 --- a/svgicons/categories/sensors.svg +++ b/svgicons/categories/sensors.svg @@ -3,16 +3,10 @@ color - - - - - - - + + diff --git a/svgicons/categories/variables.svg b/svgicons/categories/variables.svg index c50f843d..4df7d22e 100644 --- a/svgicons/categories/variables.svg +++ b/svgicons/categories/variables.svg @@ -3,27 +3,18 @@ color - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/svgicons/generateIcons.js b/svgicons/generateIcons.js index 30863fa8..166e71e0 100644 --- a/svgicons/generateIcons.js +++ b/svgicons/generateIcons.js @@ -2,10 +2,29 @@ const webfontsGenerator = require('webfonts-generator'); webfontsGenerator({ files: [ - './ultrasonic.svg', + "./ultrasonic.svg", "./color.svg", "./touch.svg", - "./gyro.svg" + "./gyro.svg", + "./categories/addpackage.svg", + "./categories/brick.svg", + "./categories/controls.svg", + "./categories/functions.svg", + "./categories/list.svg", + "./categories/logic.svg", + "./categories/loops.svg", + "./categories/math.svg", + "./categories/motors.svg", + "./categories/music.svg", + "./categories/sensors.svg", + "./categories/text.svg", + "./categories/variables.svg", + "./icons/cancel.svg", + "./icons/check.svg", + "./icons/download.svg", + "./icons/save.svg", + "./categories/advancedcollapsed.svg", + "./categories/advancedexpanded.svg" ], dest: '../docs/static/fonts/icons/', round: 10 diff --git a/theme/blockly.less b/theme/blockly.less index 25b30a31..0154b9ac 100644 --- a/theme/blockly.less +++ b/theme/blockly.less @@ -13,11 +13,18 @@ } .blocklyFlyoutLabel:not(.blocklyFlyoutHeading) .blocklyFlyoutLabelIcon { - font-family: 'legoIcons'; fill: white; font-size: 1.7rem; } +.blocklyFlyoutLabel .blocklyFlyoutLabelIcon { + font-family: 'legoIcons'; +} + +span.blocklyTreeIcon { + font-family: 'legoIcons' !important; +} + /* Toolbox padding */ .blocklyToolboxDiv, .monacoToolboxDiv { padding: 0.5rem; @@ -73,4 +80,72 @@ span.blocklyTreeLabel { #blocklyTrashIcon { margin: 0.2rem; } -} \ No newline at end of file +} + +span.blocklyTreeIcon.blocklyTreeIconmusic::before { + content: "\f10e"; +} + +span.blocklyTreeIcon.blocklyTreeIconloops::before { + content: "\f10b"; +} + +span.blocklyTreeIcon.blocklyTreeIconlogic::before { + content: "\f10a"; +} + +span.blocklyTreeIcon.blocklyTreeIconvariables::before { + content: "\f111"; +} + +span.blocklyTreeIcon.blocklyTreeIconmath::before { + content: "\f10c"; +} + +span.blocklyTreeIcon.blocklyTreeIconfunctions { + font-family: 'legoIcons' !important; +} +span.blocklyTreeIcon.blocklyTreeIconfunctions::before { + content: "\f108"; +} + +span.blocklyTreeIcon.blocklyTreeIconarrays::before { + content: "\f109"; +} + +span.blocklyTreeIcon.blocklyTreeIcontext::before { + content: "\f110"; +} + +span.blocklyTreeIcon.blocklyTreeIconcontrol::before { + content: "\f107"; +} + +span.blocklyTreeIcon.blocklyTreeIconaddpackage::before { + content: "\f105"; +} + +span.blocklyTreeIcon.blocklyTreeIconadvancedcollapsed::before { + content: "\f116"; +} + +span.blocklyTreeIcon.blocklyTreeIconadvancedexpanded::before { + content: "\f117"; +} + +.save-editortools-btn .icon.save::before { + content: "\f115" +} + +.download-button .icon.download.icon-and-text::before { + content: "\f114" +} + +.button.approve.positive .checkmark.icon::before { + content: "\f113" +} + +.button.approve.cancel .cancel.icon::before { + content: "\f112" +} +