diff --git a/docs/static/fonts/icons/iconfont.css b/docs/static/fonts/icons/iconfont.css
index 67dd1f89..9f7a0a7b 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?1aaa45a81be328d93991341b518bf26d?#iefix") format("embedded-opentype"),
-url("iconfont.woff2?1aaa45a81be328d93991341b518bf26d") format("woff2"),
-url("iconfont.woff?1aaa45a81be328d93991341b518bf26d") format("woff");
+ src: url("iconfont.eot?d6ed5932401120dae3c35f6048fd5e76?#iefix") format("embedded-opentype"),
+url("iconfont.woff2?d6ed5932401120dae3c35f6048fd5e76") format("woff2"),
+url("iconfont.woff?d6ed5932401120dae3c35f6048fd5e76") format("woff");
}
.icon {
@@ -31,57 +31,51 @@ url("iconfont.woff?1aaa45a81be328d93991341b518bf26d") format("woff");
.icon-addpackage:before {
content: "\f105";
}
-.icon-advancedcollapsed:before {
+.icon-brick:before {
content: "\f106";
}
-.icon-advancedexpanded:before {
+.icon-controls:before {
content: "\f107";
}
-.icon-brick:before {
+.icon-functions:before {
content: "\f108";
}
-.icon-controls:before {
+.icon-list:before {
content: "\f109";
}
-.icon-functions:before {
+.icon-logic:before {
content: "\f10a";
}
-.icon-list:before {
+.icon-loops:before {
content: "\f10b";
}
-.icon-logic:before {
+.icon-math:before {
content: "\f10c";
}
-.icon-loops:before {
+.icon-motors:before {
content: "\f10d";
}
-.icon-math:before {
+.icon-music:before {
content: "\f10e";
}
-.icon-motors:before {
+.icon-sensors:before {
content: "\f10f";
}
-.icon-music:before {
+.icon-text:before {
content: "\f110";
}
-.icon-sensors:before {
+.icon-variables:before {
content: "\f111";
}
-.icon-text:before {
+.icon-cancel:before {
content: "\f112";
}
-.icon-variables:before {
+.icon-check:before {
content: "\f113";
}
-.icon-cancel:before {
+.icon-download:before {
content: "\f114";
}
-.icon-check:before {
+.icon-save: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 007b931f..1de91321 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 b3a250b6..b34c4ff4 100644
--- a/docs/static/fonts/icons/iconfont.svg
+++ b/docs/static/fonts/icons/iconfont.svg
@@ -22,59 +22,53 @@
-
-
diff --git a/docs/static/fonts/icons/iconfont.ttf b/docs/static/fonts/icons/iconfont.ttf
index 115c9d92..268395b8 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 e8d97e86..a61fb1dc 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 8d9eab3d..91b8d812 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 8db92e47..32690ba1 100644
--- a/libs/ev3/ns.ts
+++ b/libs/ev3/ns.ts
@@ -1,19 +1,19 @@
-//% color="#68C3E2" weight=100 icon="\uf108"
+//% color="#68C3E2" weight=100 icon="\uf106"
//% groups='["Buttons", "Screen"]'
//% labelLineWidth=0
namespace brick {
}
-//% color="#C8509B" weight=95 icon="\uf111"
+//% 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="\uf10f"
+//% color="#A5CA18" weight=90 icon="\uf10d"
//% groups='["Motion", "Sensors", "Chassis"]'
//% labelLineWidth=0
namespace motors {
diff --git a/svgicons/categories/advancedcollapsed.svg b/svgicons/categories/advancedcollapsed.svg
deleted file mode 100644
index 087e876a..00000000
--- a/svgicons/categories/advancedcollapsed.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/svgicons/categories/advancedexpanded.svg b/svgicons/categories/advancedexpanded.svg
deleted file mode 100644
index f4b42b1b..00000000
--- a/svgicons/categories/advancedexpanded.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/svgicons/generateIcons.js b/svgicons/generateIcons.js
index 3b316ecf..01b276cc 100644
--- a/svgicons/generateIcons.js
+++ b/svgicons/generateIcons.js
@@ -7,8 +7,6 @@ webfontsGenerator({
"./touch.svg",
"./gyro.svg",
"./categories/addpackage.svg",
- "./categories/advancedcollapsed.svg",
- "./categories/advancedexpanded.svg",
"./categories/brick.svg",
"./categories/controls.svg",
"./categories/functions.svg",
diff --git a/theme/blockly.less b/theme/blockly.less
index 4a15ab27..efc223c2 100644
--- a/theme/blockly.less
+++ b/theme/blockly.less
@@ -73,56 +73,40 @@ span.blocklyTreeLabel {
}
}
-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 {
+span.blocklyTreeIcon.blocklyTreeIconloops::before {
content: "\f10b";
}
-span.blocklyTreeIcon.blocklyTreeIcontext::before {
- content: "\f112";
+span.blocklyTreeIcon.blocklyTreeIconlogic::before {
+ content: "\f10a";
}
-span.blocklyTreeIcon.blocklyTreeIconconsole::before {
- content: "";
+span.blocklyTreeIcon.blocklyTreeIconvariables::before {
+ content: "\f111";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconmath::before {
+ content: "\f10c";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconfunctions::before {
+ content: "\f108";
+}
+
+span.blocklyTreeIcon.blocklyTreeIconarrays::before {
+ content: "\f109";
+}
+
+span.blocklyTreeIcon.blocklyTreeIcontext::before {
+ content: "\f110";
}
span.blocklyTreeIcon.blocklyTreeIconcontrol::before {
- content: "\f109";
+ content: "\f107";
}
span.blocklyTreeIcon.blocklyTreeIconaddpackage::before {
@@ -130,18 +114,18 @@ span.blocklyTreeIcon.blocklyTreeIconaddpackage::before {
}
.save-editortools-btn .icon.save::before {
- content: "\f117"
-}
-
-.download-button .icon.download.icon-and-text::before {
- content: "\f116"
-}
-
-.button.approve.positive .checkmark.icon::before {
content: "\f115"
}
-.button.approve.cancel .cancel.icon::before {
+.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"
+}
+