From 2a8c4cb7500265466ce378421996f7c4832fa619 Mon Sep 17 00:00:00 2001 From: johnnyjoy Date: Wed, 5 Feb 2025 20:30:22 +0800 Subject: [PATCH] chore: update styles --- web/src/components/ActivityCalendar.tsx | 21 ++++++++++++++----- .../HomeSidebar/ShortcutsSection.tsx | 2 +- web/src/components/MemoActionMenu.tsx | 10 +++++---- web/src/components/Settings/MemberSection.tsx | 9 +++++++- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/web/src/components/ActivityCalendar.tsx b/web/src/components/ActivityCalendar.tsx index 0b3919ca5..d435da91f 100644 --- a/web/src/components/ActivityCalendar.tsx +++ b/web/src/components/ActivityCalendar.tsx @@ -73,6 +73,18 @@ const ActivityCalendar = (props: Props) => { ))} {days.map((item, index) => { const date = dayjs(`${year}-${month + 1}-${item.day}`).format("YYYY-MM-DD"); + + if (!item.isCurrentMonth) { + return ( +
+ {item.day} +
+ ); + } + const count = item.isCurrentMonth ? data[date] || 0 : 0; const isToday = dayjs().format("YYYY-MM-DD") === date; const tooltipText = @@ -89,13 +101,12 @@ const ActivityCalendar = (props: Props) => {
count && onClick && onClick(date)} > diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsx index 117f1c457..497210ea4 100644 --- a/web/src/components/HomeSidebar/ShortcutsSection.tsx +++ b/web/src/components/HomeSidebar/ShortcutsSection.tsx @@ -45,7 +45,7 @@ const ShortcutsSection = () => { className="shrink-0 w-full text-sm rounded-md leading-6 flex flex-row justify-between items-center select-none gap-2 text-gray-600 dark:text-gray-400 dark:border-zinc-800" > (selected ? memoFilterStore.setShortcut(undefined) : memoFilterStore.setShortcut(shortcut.id))} > {shortcut.title} diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index e99609d15..affb83341 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -183,10 +183,12 @@ const MemoActionMenu = (props: Props) => { )} - - - {t("memo.copy-link")} - + {!isArchived && ( + + + {t("memo.copy-link")} + + )} {!readonly && ( <> {!isArchived && hasCompletedTaskList && ( diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx index 07e017892..1bf4750c1 100644 --- a/web/src/components/Settings/MemberSection.tsx +++ b/web/src/components/Settings/MemberSection.tsx @@ -140,13 +140,20 @@ const MemberSection = () => {
{t("common.username")} - +
{t("common.password")}