Skip to content

Commit a1afb4c

Browse files
committed
Merge branch 'qa-smallaction'
2 parents 5680b6f + 68cf65b commit a1afb4c

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

public/icons/action/bg-final.png

891 KB
Loading

src/app/(protected)/action/push/[taskId]/ActionPushPageClient.tsx

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,23 @@ export default function ActionPushPageClient({
6262
setCurrentTask(task);
6363
}, [task, setCurrentTask]);
6464

65+
// 배경 스타일 설정
66+
const backgroundStyle =
67+
screenState === PushScreenState.FINAL_WARNING
68+
? {
69+
backgroundImage: "url(/icons/action/bg-final.png)",
70+
backgroundSize: "cover",
71+
backgroundPosition: "center",
72+
}
73+
: {
74+
background: "var(--background-primary)",
75+
};
76+
6577
return (
66-
<div className="flex h-full flex-col gap-4 bg-background-primary">
78+
<div
79+
className="flex h-full flex-col gap-4 overflow-hidden"
80+
style={backgroundStyle}
81+
>
6782
<Header content={SCREEN_CONTENT[screenState]} />
6883

6984
<div className="flex flex-col gap-4 px-5">
@@ -78,10 +93,11 @@ export default function ActionPushPageClient({
7893
</div>
7994

8095
<div className="relative mt-auto flex flex-col items-center px-5 pt-6">
81-
<div className="fixed bottom-0 left-0 right-0 h-[245px] bg-[rgba(65,65,137,0.40)] blur-[75px]" />
82-
{screenState === PushScreenState.FINAL_WARNING && (
83-
<div className="purple-blur-effect absolute inset-0" />
96+
{/* 기본 블러 배경 - FINAL_WARNING 상태가 아닐 때만 표시 */}
97+
{screenState !== PushScreenState.FINAL_WARNING && (
98+
<div className="fixed bottom-0 left-0 right-0 h-[245px] bg-[rgba(65,65,137,0.40)] blur-[75px]" />
8499
)}
100+
85101
<CountdownTimer timeLeft={task?.dueDatetime ?? ""} />
86102

87103
<ActionDrawer

src/app/(protected)/retrospection/[taskId]/_components/RetrospectFocusContent.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ const RetrospectFocusContent = ({
8282
window.addEventListener("touchend", handleEnd);
8383
};
8484

85-
// 슬라이더 위치 계산 - 0일 때 왼쪽 끝에 정확히 위치하도록 조정
8685
const sliderPosition =
8786
retrospectContent.concentration === 0
8887
? "-8px"

0 commit comments

Comments
 (0)