Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: remove ga and fonts

email6f8ab0f3ffd2
diff --git a/web/index.html b/web/index.html
index b6a27ea2b..665904046 100644
--- 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>
diff --git a/web/public/fonts/DINPro-Bold.otf b/web/public/fonts/DINPro-Bold.otf
deleted file mode 100644
index 7c8395364..000000000
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 84d57abb5..000000000
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 fdd309d71..000000000
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 cb3ca7141..1392b30ff 100644
--- 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;
diff --git a/web/src/less/global.less b/web/src/less/global.less
index cca9ba0d0..29660f907 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 43a8b15fb..0e790ee59 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 871f21df9..d14e372c8 100644
--- 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">