usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-09-21 06:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update global css (#657)

Browse source
This commit is contained in:
boojack 2022-12-02 21:34:43 +08:00 committed by GitHub
parent a467a7c173
commit 07f0c3f052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/src/components/MemoResources.tsx
View file

@ -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>

2
web/src/less/global.less → web/src/css/global.css
View file

@ -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";

8
web/src/main.tsx
View file

@ -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);