From 94ef92c242b18c0b09cc929120c248c528331893 Mon Sep 17 00:00:00 2001 From: Deokhaeng Lee Date: Fri, 10 Oct 2025 16:30:51 +0900 Subject: [PATCH] first margin work --- apps/desktop2/src/components/main/body/contacts/index.tsx | 2 +- apps/desktop2/src/components/main/body/folders.tsx | 4 ++-- apps/desktop2/src/components/main/body/index.tsx | 8 ++++---- apps/desktop2/src/components/main/body/sessions/index.tsx | 2 +- apps/desktop2/src/components/main/body/shared.tsx | 4 ++-- packages/ui/src/components/block/calendar-structure.tsx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/desktop2/src/components/main/body/contacts/index.tsx b/apps/desktop2/src/components/main/body/contacts/index.tsx index cba691924..2487ac910 100644 --- a/apps/desktop2/src/components/main/body/contacts/index.tsx +++ b/apps/desktop2/src/components/main/body/contacts/index.tsx @@ -134,7 +134,7 @@ function ContactView({ tab }: { tab: Tab }) { }; return ( -
+
+

All Folders

{topLevelFolderIds?.map((folderId) => )} @@ -123,7 +123,7 @@ function TabContentFolderSpecific({ folderId }: { folderId: string }) { ); return ( -
+
{(childFolderIds?.length ?? 0) > 0 && ( diff --git a/apps/desktop2/src/components/main/body/index.tsx b/apps/desktop2/src/components/main/body/index.tsx index a315fd1b6..3eb6f315e 100644 --- a/apps/desktop2/src/components/main/body/index.tsx +++ b/apps/desktop2/src/components/main/body/index.tsx @@ -20,7 +20,7 @@ export function Body() { } return ( -
+
@@ -36,13 +36,13 @@ function Header({ tabs }: { tabs: Tab[] }) { data-tauri-drag-region className={clsx([ "[&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]", - "w-full border-b overflow-x-auto h-11", + "w-full overflow-x-auto h-11", !isExpanded && "pl-[72px]", ])} >
{!isExpanded && ( -
+
setIsExpanded(true)} @@ -64,7 +64,7 @@ function Header({ tabs }: { tabs: Tab[] }) { value={tab} as="div" style={{ position: "relative" }} - className="h-full border-r border-t z-10" + className="h-full z-10" layoutScroll > diff --git a/apps/desktop2/src/components/main/body/sessions/index.tsx b/apps/desktop2/src/components/main/body/sessions/index.tsx index bd23f2be7..879945b50 100644 --- a/apps/desktop2/src/components/main/body/sessions/index.tsx +++ b/apps/desktop2/src/components/main/body/sessions/index.tsx @@ -49,7 +49,7 @@ export function TabContentNote({ tab }: { tab: Tab }) { ); return ( -
+
diff --git a/apps/desktop2/src/components/main/body/shared.tsx b/apps/desktop2/src/components/main/body/shared.tsx index ae4ef1a9a..52ae142bb 100644 --- a/apps/desktop2/src/components/main/body/shared.tsx +++ b/apps/desktop2/src/components/main/body/shared.tsx @@ -24,8 +24,8 @@ export function TabItemBase( "flex items-center gap-2 cursor-pointer", "min-w-[100px] max-w-[200px] h-full px-2", active - ? "border-border bg-background text-foreground" - : "border-transparent bg-muted/50 hover:bg-muted text-muted-foreground", + ? "bg-background text-foreground rounded-lg border" + : "bg-muted/50 hover:bg-muted text-muted-foreground rounded-lg border", ])} >
diff --git a/packages/ui/src/components/block/calendar-structure.tsx b/packages/ui/src/components/block/calendar-structure.tsx index d2e5648bb..aa030746d 100644 --- a/packages/ui/src/components/block/calendar-structure.tsx +++ b/packages/ui/src/components/block/calendar-structure.tsx @@ -21,8 +21,8 @@ export const CalendarStructure = ({ children, }: CalendarStructureProps) => { return ( -
-
+
+
{monthLabel}