From d9b739423a536997a98159ea8722b0a9a7df0491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A7=84=EB=A6=AC/=EC=8A=A4=ED=86=A0=EC=96=B4?= =?UTF-8?q?=ED=94=84=EB=A1=A0=ED=8A=B8=ED=8C=80?= Date: Wed, 28 Feb 2024 01:34:31 +0900 Subject: [PATCH 1/2] style: fix border width 1 --- src/components/ui/input.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx index ee8d328..5ea1f3d 100644 --- a/src/components/ui/input.tsx +++ b/src/components/ui/input.tsx @@ -19,7 +19,7 @@ const containerVariants = cva("", { variants: { variant: { default: "border-grey-300", - focused: "border-2 border-main-700", + focused: "border border-main-700", error: "border-error", }, }, From 73f937c6f0f343ae8f531f77782753ef40bd8877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A7=84=EB=A6=AC/=EC=8A=A4=ED=86=A0=EC=96=B4?= =?UTF-8?q?=ED=94=84=EB=A1=A0=ED=8A=B8=ED=8C=80?= Date: Wed, 28 Feb 2024 01:53:40 +0900 Subject: [PATCH 2/2] style: toast styling --- src/app/(main)/ticker/_components/ticker-content.tsx | 6 +++++- src/components/common/toast/toast.tsx | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/(main)/ticker/_components/ticker-content.tsx b/src/app/(main)/ticker/_components/ticker-content.tsx index 615c0e8..4e7a063 100644 --- a/src/app/(main)/ticker/_components/ticker-content.tsx +++ b/src/app/(main)/ticker/_components/ticker-content.tsx @@ -91,6 +91,7 @@ const TickerContent = React.memo(() => { const handleDeleteClick = React.useCallback(() => { const prevStock = selectedStock; + const stockLength = stocks.length; if (selectedStock) { removeStock(selectedStock); resetData(); @@ -102,11 +103,14 @@ const TickerContent = React.memo(() => { handleUndo={() => { prevStock && addStock(prevStock); }} + style={{ + marginBottom: stockLength === 1 ? "0" : "4.5rem", + }} /> )); return isDrawerOpenChange(false); } - }, [addStock, isDrawerOpenChange, removeStock, resetData, selectedStock]); + }, [addStock, isDrawerOpenChange, removeStock, resetData, selectedStock, stocks.length]); const handleConfirmClick = React.useCallback(() => { if (selectedStock) { diff --git a/src/components/common/toast/toast.tsx b/src/components/common/toast/toast.tsx index 8c2f93a..4416f79 100644 --- a/src/components/common/toast/toast.tsx +++ b/src/components/common/toast/toast.tsx @@ -19,11 +19,12 @@ const Toast = React.memo(({ t, title, isRevertable, handleUndo, ...props }: Toas return (

{title}

{isRevertable && } @@ -33,7 +34,7 @@ const Toast = React.memo(({ t, title, isRevertable, handleUndo, ...props }: Toas const UndoButton = React.memo(({ onClick }: { onClick: () => void }) => { return ( - );