diff --git a/docs/calliope/firststeps/Radio.jpg b/docs/calliope/firststeps/Radio.jpg
index 7badc11b..e13b8b8d 100644
Binary files a/docs/calliope/firststeps/Radio.jpg and b/docs/calliope/firststeps/Radio.jpg differ
diff --git a/docs/static/fonts/Roboto_400_normal.svg b/docs/static/fonts/Roboto_400_normal.svg
deleted file mode 100644
index 627f5a36..00000000
--- a/docs/static/fonts/Roboto_400_normal.svg
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-
diff --git a/docs/static/fonts/Roboto_400_normal.ttf b/docs/static/fonts/Roboto_400_normal.ttf
deleted file mode 100644
index 45d1e376..00000000
Binary files a/docs/static/fonts/Roboto_400_normal.ttf and /dev/null differ
diff --git a/docs/static/fonts/Roboto_400_normal.woff b/docs/static/fonts/Roboto_400_normal.woff
deleted file mode 100644
index 296609e0..00000000
Binary files a/docs/static/fonts/Roboto_400_normal.woff and /dev/null differ
diff --git a/docs/static/fonts/fonts.css b/docs/static/fonts/fonts.css
index 87fc735a..b483bf36 100644
--- a/docs/static/fonts/fonts.css
+++ b/docs/static/fonts/fonts.css
@@ -1,11 +1,13 @@
+/* roboto-mono-regular - latin */
@font-face {
- font-family: 'Roboto';
+ font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
- src: url(Roboto_400_normal.eot); /* {{embedded-opentype-gf-url}} */
- src: local('☺'),
- url(Roboto_400_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */
- url(Roboto_400_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/roboto/v16/2UX7WLTfW3W8TclTUvlFyQ.woff */
- url(Roboto_400_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/roboto/v16/QHD8zigcbDB8aPfIoaupKOvvDin1pK8aKteLpeZ5c0A.ttf */
- url(Roboto_400_normal.svg#Roboto_400_normal) format('svg'); /* http://fonts.gstatic.com/l/font?kit=_YZOZaQ9UBZzaxiLBLcgZg&skey=a0a0114a1dcab3ac&v=v16#Roboto */
-}
+ src: url('../fonts/roboto-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */
+ src: local('Roboto Mono'), local('RobotoMono-Regular'),
+ url('../fonts/roboto-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('../fonts/roboto-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+ url('../fonts/roboto-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
+ url('../fonts/roboto-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+ url('../fonts/roboto-mono-v7-latin-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
+ }
\ No newline at end of file
diff --git a/docs/static/fonts/roboto-mono-v7-latin-regular.eot b/docs/static/fonts/roboto-mono-v7-latin-regular.eot
new file mode 100644
index 00000000..4d727cc8
Binary files /dev/null and b/docs/static/fonts/roboto-mono-v7-latin-regular.eot differ
diff --git a/docs/static/fonts/roboto-mono-v7-latin-regular.svg b/docs/static/fonts/roboto-mono-v7-latin-regular.svg
new file mode 100644
index 00000000..f384d9ce
--- /dev/null
+++ b/docs/static/fonts/roboto-mono-v7-latin-regular.svg
@@ -0,0 +1,390 @@
+
+
+
diff --git a/docs/static/fonts/roboto-mono-v7-latin-regular.ttf b/docs/static/fonts/roboto-mono-v7-latin-regular.ttf
new file mode 100644
index 00000000..e832a4ec
Binary files /dev/null and b/docs/static/fonts/roboto-mono-v7-latin-regular.ttf differ
diff --git a/docs/static/fonts/roboto-mono-v7-latin-regular.woff b/docs/static/fonts/roboto-mono-v7-latin-regular.woff
new file mode 100644
index 00000000..c41382c2
Binary files /dev/null and b/docs/static/fonts/roboto-mono-v7-latin-regular.woff differ
diff --git a/docs/static/fonts/roboto-mono-v7-latin-regular.woff2 b/docs/static/fonts/roboto-mono-v7-latin-regular.woff2
new file mode 100644
index 00000000..53d4b505
Binary files /dev/null and b/docs/static/fonts/roboto-mono-v7-latin-regular.woff2 differ
diff --git a/pxtarget.json b/pxtarget.json
index b1badcd1..ed0e2251 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -367,7 +367,7 @@
"math": "#712672",
"variables": "#A80000",
"text": "#996600",
- "advanced": "#DDDDDD",
+ "advanced": "#42495f",
"functions": "#005A9E",
"arrays": "#E65722"
},
diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts
index e8c0032e..1cc064a0 100644
--- a/sim/visuals/microbit.ts
+++ b/sim/visuals/microbit.ts
@@ -145,663 +145,486 @@ namespace pxsim.visuals {
}
`;
const BOARD_SVG = `
-
- `;
const pinNames = [
"BTN_A", "BTN_B",
@@ -1283,10 +1106,10 @@ namespace pxsim.visuals {
}
else if (pin.mode & PinFlags.Touch) {
v = pin.touched ? "0%" : "100%";
- if (text) text.textContent = "TOUCHED";
+ if (text) text.textContent = "";
} else {
v = "100%";
- if (text) text.textContent = "unused";
+ if (text) text.textContent = "";
}
if (v) svg.setGradientValue(this.pinGradients[index], v);
}
@@ -1735,4 +1558,4 @@ namespace pxsim.visuals {
})
}
}
-}
+}
\ No newline at end of file
diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables
index e73dad24..f1fe85ba 100644
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@@ -2,7 +2,7 @@
User Global Variables
*******************************/
-@importGoogleFonts: true;
+@importGoogleFonts: false;
@fontName : 'Roboto Mono';
@@ -24,7 +24,7 @@
@brown:#6B5B4C;
@grey:#42495F;
-@pageBackground : #FDFDFA;
+@pageBackground: #FDFDFA;
/*******************************
PXT Overrides
diff --git a/theme/style.less b/theme/style.less
index dc4401e3..b0dc2495 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -14,13 +14,21 @@
*******************************/
/* Roboto font */
-@RobotoFont: data-uri("../docs/static/fonts/Roboto_400_normal.woff");
-
-@font-face {
- font-family: 'Roboto';
- src: @RobotoFont format("woff");
-}
+// @RobotoMonoFont: data-uri("../docs/static/fonts/Roboto_Mono_400_normal.woff2");
+/* roboto-mono-regular - latin */
+@font-face {
+ font-family: 'Roboto Mono';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../static/fonts/roboto-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */
+ src: local('Roboto Mono'), local('RobotoMono-Regular'),
+ url('../static/fonts/roboto-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('../static/fonts/roboto-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+ url('../static/fonts/roboto-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
+ url('../static/fonts/roboto-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+ url('../static/fonts/roboto-mono-v7-latin-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
+ }
.ui.button.download-button {
&:extend(.ui.purple.button all);
}