diff --git a/docs/static/fonts/icons/iconfont.css b/docs/static/fonts/icons/iconfont.css
index f81b9f9f..67dd1f89 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?1aaa45a81be328d93991341b518bf26d?#iefix") format("embedded-opentype"),
+url("iconfont.woff2?1aaa45a81be328d93991341b518bf26d") format("woff2"),
+url("iconfont.woff?1aaa45a81be328d93991341b518bf26d") format("woff");
}
.icon {
@@ -28,3 +28,60 @@ url("iconfont.woff?e05611aaee246c1da118a83eaf515de9") format("woff");
.icon-gyro:before {
content: "\f104";
}
+.icon-addpackage:before {
+ content: "\f105";
+}
+.icon-advancedcollapsed:before {
+ content: "\f106";
+}
+.icon-advancedexpanded:before {
+ content: "\f107";
+}
+.icon-brick:before {
+ content: "\f108";
+}
+.icon-controls:before {
+ content: "\f109";
+}
+.icon-functions:before {
+ content: "\f10a";
+}
+.icon-list:before {
+ content: "\f10b";
+}
+.icon-logic:before {
+ content: "\f10c";
+}
+.icon-loops:before {
+ content: "\f10d";
+}
+.icon-math:before {
+ content: "\f10e";
+}
+.icon-motors:before {
+ content: "\f10f";
+}
+.icon-music:before {
+ content: "\f110";
+}
+.icon-sensors:before {
+ content: "\f111";
+}
+.icon-text:before {
+ content: "\f112";
+}
+.icon-variables:before {
+ content: "\f113";
+}
+.icon-cancel:before {
+ content: "\f114";
+}
+.icon-check:before {
+ content: "\f115";
+}
+.icon-download:before {
+ content: "\f116";
+}
+.icon-save:before {
+ content: "\f117";
+}
diff --git a/docs/static/fonts/icons/iconfont.eot b/docs/static/fonts/icons/iconfont.eot
index e4aa0b6d..007b931f 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..b3a250b6 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..115c9d92 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..e8d97e86 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..8d9eab3d 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..8db92e47 100644
--- a/libs/ev3/ns.ts
+++ b/libs/ev3/ns.ts
@@ -1,19 +1,19 @@
-//% color="#68C3E2" weight=100
+//% color="#68C3E2" weight=100 icon="\uf108"
//% groups='["Buttons", "Screen"]'
//% labelLineWidth=0
namespace brick {
}
-//% color="#C8509B" weight=95 icon="\uf192"
+//% color="#C8509B" weight=95 icon="\uf111"
//% 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="\uf10f"
//% groups='["Motion", "Sensors", "Chassis"]'
//% labelLineWidth=0
namespace motors {
diff --git a/svgicons/generateIcons.js b/svgicons/generateIcons.js
index 30863fa8..3b316ecf 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/advancedcollapsed.svg",
+ "./categories/advancedexpanded.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"
],
dest: '../docs/static/fonts/icons/',
round: 10
diff --git a/theme/blockly.less b/theme/blockly.less
index 4d980269..341a2c52 100644
--- a/theme/blockly.less
+++ b/theme/blockly.less
@@ -9,7 +9,7 @@
/* Fonts for toolbox icons */
@font-face {
font-family: 'legoIcons';
- src: data-uri("../docs/static/fonts/icons/iconfont.woff2");
+ src: data-uri("../docs/static/fonts/icons/iconfont.woff") format('woff');
}
.blocklyFlyoutLabel:not(.blocklyFlyoutHeading) .blocklyFlyoutLabelIcon {
@@ -18,6 +18,10 @@
font-size: 1.7rem;
}
+span.blocklyTreeIcon {
+ font-family: 'legoIcons' !important;
+}
+
/* Toolbox padding */
.blocklyToolboxDiv, .monacoToolboxDiv {
padding: 0.5rem;
@@ -67,4 +71,60 @@ span.blocklyTreeLabel {
#blocklyTrashIcon {
margin: 0.2rem;
}
+}
+
+span.blocklyTreeIcon.blocklyTreeIcontests::before {
+ content: "";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconmusic::before {
+ content: "\f110";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconloops::before {
+ content: "\f10d";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconlogic::before {
+ content: "\f10c";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconvariables::before {
+ content: "\f113";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconmath::before {
+ content: "\f10e";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconadvancedcollapsed::before {
+ content: "\f106";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconadvancedexpanded::before {
+ content: "\f107";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconfunctions::before {
+ content: "\f10a";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconarrays::before {
+ content: "";
+}
+
+span.blocklyTreeIcon.blocklyTreeIcontext::before {
+ content: "\f112";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconconsole::before {
+ content: "";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconcontrol::before {
+ content: "\f109";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconaddpackage::before {
+ content: "\f105";
}
\ No newline at end of file