From 8a266f904d36b226f4bd114a9527509734ed488f Mon Sep 17 00:00:00 2001 From: sooyeoniya Date: Sun, 18 Aug 2024 18:54:42 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=B0=94=20=EB=B9=84=EC=9C=A8=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20z-index=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/features/RushGame/RushGameComponents/RushBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/features/RushGame/RushGameComponents/RushBar.tsx b/client/src/features/RushGame/RushGameComponents/RushBar.tsx index d2e10d0b..ef9c8cae 100644 --- a/client/src/features/RushGame/RushGameComponents/RushBar.tsx +++ b/client/src/features/RushGame/RushGameComponents/RushBar.tsx @@ -31,7 +31,7 @@ interface BarProps extends BarVariantsProps { export default function RushBar({ ratio, color, status, textAlign }: BarProps) { return ( -

{ratio}%

+

{ratio}%

); } From 48f91dbf182f4b1d8d54a8af090f05557c7a35c2 Mon Sep 17 00:00:00 2001 From: sooyeoniya Date: Sun, 18 Aug 2024 19:02:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20"=EB=8B=A4=EB=A5=B8=20=EC=82=AC?= =?UTF-8?q?=EB=9E=8C=EC=9D=98=20=EC=8A=A4=EB=A7=88=EC=9D=BC=20=EB=A1=9C?= =?UTF-8?q?=EB=B4=87=20=EB=B1=83=EC=A7=80=20=EB=B3=B4=EB=9F=AC=EA=B0=80?= =?UTF-8?q?=EA=B8=B0"=20=EC=A0=84=EC=B2=B4=20width=20=EB=A1=9C=20cursor=20?= =?UTF-8?q?=EC=9E=A1=ED=9E=88=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/features/Main/Lottery.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/src/features/Main/Lottery.tsx b/client/src/features/Main/Lottery.tsx index 34e5cd91..1383aef6 100644 --- a/client/src/features/Main/Lottery.tsx +++ b/client/src/features/Main/Lottery.tsx @@ -75,13 +75,15 @@ function Lottery({ id }: SectionKeyProps) { - -

다른 사람들의 스마일 로봇 뱃지 보러가기

- - +
+ +

다른 사람들의 스마일 로봇 뱃지 보러가기

+ + +
); } From fa5f6afd5d75a49bacdd2e8bd8c8601f2fa008ff Mon Sep 17 00:00:00 2001 From: sooyeoniya Date: Sun, 18 Aug 2024 19:14:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EC=83=88=EB=A1=9C=EA=B3=A0?= =?UTF-8?q?=EC=B9=A8=20=ED=88=B4=ED=8C=81=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EB=B6=80=EB=93=9C=EB=9F=BD=EA=B2=8C=20=EC=82=AC=EB=9D=BC?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=EC=9D=B8=ED=84=B0=EB=A0=89=EC=85=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RushCardCurrentRatio.tsx | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/client/src/features/RushGame/RushGameComponents/RushCardCurrentRatio.tsx b/client/src/features/RushGame/RushGameComponents/RushCardCurrentRatio.tsx index 832b5443..b52a276b 100644 --- a/client/src/features/RushGame/RushGameComponents/RushCardCurrentRatio.tsx +++ b/client/src/features/RushGame/RushGameComponents/RushCardCurrentRatio.tsx @@ -1,3 +1,4 @@ +import { cva } from "class-variance-authority"; import Tooltip from "@/components/Tooltip"; import { CARD_OPTION } from "@/constants/Rush/rushCard.ts"; import RushCurrentOptionDisplay from "@/features/RushGame/RushGameComponents/RushCurrentOptionDisplay.tsx"; @@ -7,6 +8,18 @@ import useToggleContents from "@/hooks/useToggleContents.ts"; import { CardOption } from "@/types/rushGame.ts"; import Reload from "/public/assets/icons/reload.svg?react"; +const tooltipVariants = cva(`absolute transition-opacity duration-300 ease-in-out`, { + variants: { + visible: { + true: "opacity-1 visibility-visible", + false: "opacity-0 visibility-hidden", + }, + }, + defaultVariants: { + visible: true, + }, +}); + const TOOLTIP_CONTENT = () => ( <> 새로고침을 눌러 @@ -77,17 +90,12 @@ export default function RushCardCurrentRatio() { />
- {toggleContents ? ( - - - - ) : ( - - )} +
+ +
+
);