waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix font loading

Browse Source
This commit is contained in:
sawka
2022-10-10 12:08:29 -07:00
parent 05592bda4c
commit 051110cdc1
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sh2.less
+2 -2
View File
@@ -30,6 +30,7 @@
@soft-blue: #729fcf;
/*
@font-face {
font-family: 'JetBrains Mono';
font-style: normal;
@@ -38,7 +39,6 @@
url('../static/fonts/jetbrains-mono-v13-latin-200.woff2') format('woff2'),
url('../static/fonts/jetbrains-mono-v13-latin-200.woff') format('woff');
}
/* jetbrains-mono-regular - latin */
@font-face {
font-family: 'JetBrains Mono';
font-style: normal;
@@ -47,7 +47,6 @@
url('../static/fonts/jetbrains-mono-v13-latin-regular.woff2') format('woff2'),
url('../static/fonts/jetbrains-mono-v13-latin-regular.woff') format('woff');
}
/* jetbrains-mono-700 - latin */
@font-face {
font-family: 'JetBrains Mono';
font-style: normal;
@@ -56,6 +55,7 @@
url('../static/fonts/jetbrains-mono-v13-latin-700.woff2') format('woff2'),
url('../static/fonts/jetbrains-mono-v13-latin-700.woff') format('woff');
}
*/
.mono-font(@size: inherit, @weight: inherit) {
font-family: 'JetBrains Mono', monospace;
src/sh2.ts
+18 -2
View File
@@ -11,13 +11,29 @@ import {v4 as uuidv4} from "uuid";
// @ts-ignore
let VERSION = __SHVERSION__;
let jbmFontNormal = new FontFace("JetBrains Mono", "url('static/fonts/jetbrains-mono-v13-latin-regular.woff2')", {style: "normal", weight: "400"});
let jbmFont200 = new FontFace("JetBrains Mono", "url('static/fonts/jetbrains-mono-v13-latin-200.woff2')", {style: "normal", weight: "200"});
let jbmFont700 = new FontFace("JetBrains Mono", "url('static/fonts/jetbrains-mono-v13-latin-700.woff2')", {style: "normal", weight: "700"});
let loadPromise = document.fonts.add(jbmFontNormal);
document.fonts.add(jbmFont200);
document.fonts.add(jbmFont700);
jbmFontNormal.load();
jbmFont200.load();
jbmFont700.load();
document.addEventListener("DOMContentLoaded", () => {
let reactElem = React.createElement(Main, null, null);
let elem = document.getElementById("app");
let root = createRoot(elem);
setTimeout(() => {
let isFontLoaded = document.fonts.check("12px 'JetBrains Mono'");
if (isFontLoaded) {
root.render(reactElem);
}, 500);
}
else {
document.fonts.ready.then(() => {
root.render(reactElem);
});
}
});
(window as any).mobx = mobx;