diff --git a/web/index.html b/web/index.html index b6a27ea2..66590404 100644 --- a/web/index.html +++ b/web/index.html @@ -10,16 +10,5 @@
- - - diff --git a/web/public/fonts/DINPro-Bold.otf b/web/public/fonts/DINPro-Bold.otf deleted file mode 100644 index 7c839536..00000000 Binary files a/web/public/fonts/DINPro-Bold.otf and /dev/null differ diff --git a/web/public/fonts/DINPro-Regular.otf b/web/public/fonts/DINPro-Regular.otf deleted file mode 100644 index 84d57abb..00000000 Binary files a/web/public/fonts/DINPro-Regular.otf and /dev/null differ diff --git a/web/public/fonts/UbuntuMono.ttf b/web/public/fonts/UbuntuMono.ttf deleted file mode 100644 index fdd309d7..00000000 Binary files a/web/public/fonts/UbuntuMono.ttf and /dev/null differ diff --git a/web/src/labs/html2image/index.ts b/web/src/labs/html2image/index.ts index cb3ca714..1392b30f 100644 --- a/web/src/labs/html2image/index.ts +++ b/web/src/labs/html2image/index.ts @@ -6,7 +6,6 @@ * 2. : https://developer.mozilla.org/en-US/docs/Web/SVG/Element/foreignObject */ import getCloneStyledElement from "./getCloneStyledElement"; -import getFontsStyleElement from "./getFontsStyleElement"; type Options = Partial<{ backgroundColor: string; @@ -60,8 +59,6 @@ export const toSVG = async (element: HTMLElement, options?: Options) => { } const svg = generateSVGElement(width, height, clonedElement); - svg.prepend(await getFontsStyleElement(element)); - const url = convertSVGToDataURL(svg); return url; diff --git a/web/src/less/global.less b/web/src/less/global.less index cca9ba0d..29660f90 100644 --- a/web/src/less/global.less +++ b/web/src/less/global.less @@ -1,32 +1,11 @@ @import "./mixin.less"; -// ⚠️ This font is only free for personal use but not for commercial. -@font-face { - font-family: "DINPro"; - src: url("/fonts/DINPro-Regular.otf"); - font-weight: normal; -} - -@font-face { - font-family: "DINPro"; - src: url("/fonts/DINPro-Bold.otf"); - font-weight: bold; -} - -@font-face { - font-family: "ubuntu-mono"; - src: url("/fonts/UbuntuMono.ttf"); - font-style: normal; -} - * { margin: 0; padding: 0; box-sizing: border-box; color: @text-black; -webkit-tap-highlight-color: transparent; - font-family: "DINPro", ui-sans-serif, -apple-system, "system-ui", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, - "Segoe UI Emoji", "Segoe UI Symbol"; } body, @@ -35,6 +14,9 @@ html { height: 100%; overflow: hidden; font-size: 15px; + font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Noto Sans", "Noto Sans CJK SC", "Microsoft YaHei UI", "Microsoft YaHei", + "WenQuanYi Micro Hei", sans-serif, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", + "Noto Color Emoji"; } code { diff --git a/web/src/less/mixin.less b/web/src/less/mixin.less index 43a8b15f..0e790ee5 100644 --- a/web/src/less/mixin.less +++ b/web/src/less/mixin.less @@ -16,7 +16,7 @@ @bg-paper-yellow: #fbf4de; .mono-font-family { - font-family: "ubuntu-mono", SFMono-Regular, Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; + font-family: SFMono-Regular, Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; } .hide-scroll-bar { diff --git a/web/src/pages/Signin.tsx b/web/src/pages/Signin.tsx index 871f21df..d14e372c 100644 --- a/web/src/pages/Signin.tsx +++ b/web/src/pages/Signin.tsx @@ -146,7 +146,7 @@ const Signin: React.FC = () => { <>
- Usernmae + Username