From 07f0c3f052731f08cfe9ae12be8cb1323f09a29c Mon Sep 17 00:00:00 2001
From: boojack <stevenlgtm@gmail.com>
Date: Fri, 2 Dec 2022 21:34:43 +0800
Subject: [PATCH] chore: update global css (#657)

---
 web/src/components/MemoResources.tsx         | 4 +++-
 web/src/{less/global.less => css/global.css} | 2 +-
 web/src/main.tsx                             | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename web/src/{less/global.less => css/global.css} (87%)

diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx
index 5c340e3f..2b304cee 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 6d461baa..ba2d66a4 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 c41d2fef..4afd9d48 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);