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: tweak embeded memo style

Steven5704aaad084b
diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsx
index 2ee095de5..d8a11d687 100644
--- a/web/src/components/HomeSidebar/TagsSection.tsx
+++ b/web/src/components/HomeSidebar/TagsSection.tsx
@@ -60,17 +60,19 @@ const TagsSection = (props: Props) => {
<div className="flex flex-col justify-start items-start w-full mt-3 px-1 h-auto shrink-0 flex-nowrap hide-scrollbar">
<div className="flex flex-row justify-between items-center w-full gap-1 mb-1 text-sm leading-6 text-gray-400 select-none">
<span>{t("common.tags")}</span>
- <Popover>
- <PopoverTrigger>
- <Icon.MoreHorizontal className="w-4 h-auto shrink-0 opacity-60" />
- </PopoverTrigger>
- <PopoverContent>
- <div className="w-auto flex flex-row justify-between items-center gap-2">
- <span className="text-sm shrink-0">Tree mode</span>
- <Switch size="sm" checked={treeMode} onChange={(event) => setTreeMode(event.target.checked)} />
- </div>
- </PopoverContent>
- </Popover>
+ {tagAmounts.length > 0 && (
+ <Popover>
+ <PopoverTrigger>
+ <Icon.MoreVertical className="w-4 h-auto shrink-0 opacity-60" />
+ </PopoverTrigger>
+ <PopoverContent>
+ <div className="w-auto flex flex-row justify-between items-center gap-2">
+ <span className="text-sm shrink-0">Tree mode</span>
+ <Switch size="sm" checked={treeMode} onChange={(event) => setTreeMode(event.target.checked)} />
+ </div>
+ </PopoverContent>
+ </Popover>
+ )}
</div>
{tagAmounts.length > 0 ? (
treeMode ? (
diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
index a28e4d98a..b53b81e11 100644
--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
@@ -1,3 +1,4 @@
+import clsx from "clsx";
import copy from "copy-to-clipboard";
import { useContext, useEffect } from "react";
import toast from "react-hot-toast";
@@ -43,22 +44,20 @@ const EmbeddedMemo = ({ resourceId: uid, params: paramsStr }: Props) => {
// Add the memo to the set of embedded memos. This is used to prevent infinite loops when a memo embeds itself.
context.embeddedMemos.add(resourceName);
const contentNode = useSnippet ? (
- <div className={inlineMode ? "" : "line-clamp-3"}>{memo.snippet}</div>
+ <div className={clsx("text-gray-800 dark:text-gray-400", inlineMode ? "" : "line-clamp-3")}>{memo.snippet}</div>
) : (
- <MemoContent
- contentClassName={inlineMode ? "" : "line-clamp-3"}
- memoName={memo.name}
- nodes={memo.nodes}
- embeddedMemos={context.embeddedMemos}
- />
+ <>
+ <MemoContent
+ contentClassName={inlineMode ? "" : "line-clamp-3"}
+ memoName={memo.name}
+ nodes={memo.nodes}
+ embeddedMemos={context.embeddedMemos}
+ />
+ <MemoResourceListView resources={memo.resources} />
+ </>
);
if (inlineMode) {
- return (
- <div className="w-full">
- {contentNode}
- <MemoResourceListView resources={memo.resources} />
- </div>
- );
+ return <div className="w-full">{contentNode}</div>;
}
const copyMemoUid = (uid: string) => {
@@ -67,22 +66,21 @@ const EmbeddedMemo = ({ resourceId: uid, params: paramsStr }: Props) => {
};
return (
- <div className="relative flex flex-col justify-start items-start w-full px-3 py-2 bg-white dark:bg-zinc-800 rounded-lg border border-gray-200 dark:border-zinc-700 hover:shadow">
- <div className="w-full mb-1 flex flex-row justify-between items-center">
- <div className="text-sm leading-6 text-gray-400 select-none">
+ <div className="relative flex flex-col justify-start items-start w-full px-3 py-2 bg-zinc-50 dark:bg-zinc-900 rounded-lg border border-gray-200 dark:border-zinc-700 hover:shadow">
+ <div className="w-full mb-1 flex flex-row justify-between items-center text-gray-400 dark:text-gray-500">
+ <div className="text-sm leading-5 select-none">
<relative-time datetime={memo.displayTime?.toISOString()} format="datetime" tense="past"></relative-time>
</div>
<div className="flex justify-end items-center gap-1">
- <span className="text-xs opacity-40 leading-4 cursor-pointer hover:opacity-60" onClick={() => copyMemoUid(memo.uid)}>
+ <span className="text-xs opacity-60 leading-5 cursor-pointer hover:opacity-80" onClick={() => copyMemoUid(memo.uid)}>
{memo.uid.slice(0, 8)}
</span>
- <Link className="hover:opacity-80" to={`/m/${memo.uid}`} unstable_viewTransition>
- <Icon.ArrowUpRight className="w-5 h-auto opacity-80 text-gray-400" />
+ <Link className="opacity-60 hover:opacity-80" to={`/m/${memo.uid}`} unstable_viewTransition>
+ <Icon.ArrowUpRight className="w-5 h-auto" />
</Link>
</div>
</div>
{contentNode}
- <MemoResourceListView resources={memo.resources} />
</div>
);
};