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: update global css (#657)

boojack07f0c3f05273
diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx
index 5c340e3fa..2b304cee9 100644
--- a/web/src/components/MemoResources.tsx
+++ b/web/src/components/MemoResources.tsx
@@ -45,8 +45,10 @@ const MemoResources: React.FC<Props> = (props: Props) => {
return (
<Image className="memo-resource" key={resource.id} imgUrls={imgUrls} index={imgUrls.findIndex((item) => item === url)} />
);
- } else {
+ } else if (resource.type.startsWith("video")) {
return <video className="memo-resource" controls key={resource.id} src={url} />;
+ } else {
+ return null;
}
})}
</div>
diff --git a/web/src/less/global.less b/web/src/css/global.css
similarity index 87%
rename from web/src/less/global.less
rename to web/src/css/global.css
index 6d461baa4..ba2d66a4b 100644
--- a/web/src/less/global.less
+++ b/web/src/css/global.css
@@ -1,6 +1,6 @@
body,
html {
- @apply text-base;
+ @apply text-base bg-white dark:bg-zinc-800;
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";
diff --git a/web/src/main.tsx b/web/src/main.tsx
index c41d2fef3..4afd9d485 100644
--- a/web/src/main.tsx
+++ b/web/src/main.tsx
@@ -1,3 +1,4 @@
+import { CssVarsProvider } from "@mui/joy";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import { createRoot } from "react-dom/client";
@@ -6,14 +7,13 @@ import store from "./store";
import App from "./App";
import "./i18n";
import "./helpers/polyfill";
-import "highlight.js/styles/github.css";
-import "./less/global.less";
-import "./css/tailwind.css";
import "dayjs/locale/zh";
import "dayjs/locale/fr";
import "dayjs/locale/vi";
-import { CssVarsProvider } from "@mui/joy";
import theme from "./theme";
+import "highlight.js/styles/github.css";
+import "./css/global.css";
+import "./css/tailwind.css";
dayjs.extend(relativeTime);