chore: remove ga and fonts

3 years ago · 6f8ab0f3ff
parent 61cf4512b0
commit 6f8ab0f3ff
8 changed files with 5 additions and 37 deletions
--- a/web/index.html
+++ b/web/index.html
@ -10,16 +10,5 @@
  <body>
    <div id="root"></div>
    <script type="module" src="/src/main.tsx"></script>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-QMWPX445H6"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-      gtag("js", new Date());
-
-      gtag("config", "G-QMWPX445H6");
-    </script>
  </body>
 </html>
--- a/web/public/fonts/DINPro-Bold.otf
+++ b/web/public/fonts/DINPro-Bold.otf
--- a/web/public/fonts/DINPro-Regular.otf
+++ b/web/public/fonts/DINPro-Regular.otf
--- a/web/public/fonts/UbuntuMono.ttf
+++ b/web/public/fonts/UbuntuMono.ttf
--- a/web/src/labs/html2image/index.ts
+++ b/web/src/labs/html2image/index.ts
@ -6,7 +6,6 @@
 * 2. <foreignObject>: 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;
--- 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 {
--- 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 {
--- a/web/src/pages/Signin.tsx
+++ b/web/src/pages/Signin.tsx
@ -146,7 +146,7 @@ const Signin: React.FC<Props> = () => {
          <>
            <div className="page-content-container">
              <div className="form-item-container input-form-container">
-                <span className={"normal-text " + (username === "" ? "" : "not-null")}>Usernmae</span>
+                <span className={"normal-text " + (username === "" ? "" : "not-null")}>Username</span>
                <input type="text" autoComplete="off" value={username} onChange={handleUsernameInputChanged} />
              </div>
              <div className="form-item-container input-form-container">