Skip to content

Commit 89ae240

Browse files
committed
๐Ÿ’„ย Style: ์ผ์‹œ์ •์ง€ ์‹œ ํšŒ์ƒ‰ ํ…Œ๋‘๋ฆฌ & ํšŒ์ƒ‰ ์‹œ๊ฐ„ ๋ ˆ์ด๋ธ”
1 parent 9481823 commit 89ae240

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

โ€Žsrc/pages/meditation/components/MeditationTimer.style.tsโ€Ž

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
import styled from '@emotion/styled';
22

3-
interface TimerContainerProps {
4-
timerPaused: boolean;
5-
}
6-
7-
export const TimerContainer = styled.div<TimerContainerProps>`
3+
export const TimerContainer = styled.div<{ timerPaused: boolean }>`
84
${({ theme }) => theme.style.flexCenter};
95
width: 170px;
106
height: 170px;
117
border-radius: 50%;
128
background: ${({ theme, timerPaused }) =>
139
timerPaused
14-
? theme.color.linearGradientRedVivid
10+
? theme.color.linearGradientGreyVivid
1511
: theme.color.linearGradientPurpleVivid};
1612
margin-top: 100px;
1713
`;
1814

19-
export const TimerElement = styled.button`
15+
export const TimerElement = styled.button<{ timerPaused: boolean }>`
2016
${({ theme }) => theme.style.flexCenter};
2117
border: none;
2218
outline: none;
@@ -25,7 +21,8 @@ export const TimerElement = styled.button`
2521
height: 150px;
2622
border-radius: 50%;
2723
background-color: #211730;
28-
color: ${({ theme }) => theme.color.white};
24+
color: ${({ theme, timerPaused }) =>
25+
timerPaused ? theme.color.greyLight : theme.color.white};
2926
font-size: 1.5rem;
3027
font-weight: bold;
3128
&:hover {

โ€Žsrc/pages/meditation/components/MeditationTimer.tsxโ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ const MeditationTimer = () => {
5454
return (
5555
<TimerContainer timerPaused={timerId && paused}>
5656
<TimerElement
57+
timerPaused={timerId && paused}
5758
onClick={() => toggleTimer()}
5859
onMouseOver={() => setHovered(true)}
5960
onMouseLeave={() => setHovered(false)}

โ€Žsrc/styles/colors.tsโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ export const color = {
2727
linearGradientPurple:
2828
'linear-gradient(160deg, #2a2427 0%, #47346d 50%, #7e4ea4 75%, #b796d0 100%)',
2929
linearGradientPurpleVivid: `linear-gradient(90deg, #47346d 0%, #5e12ff 100%)`,
30-
linearGradientRedVivid: `linear-gradient(90deg, #4b111f 0%, #ff2012 100%)`,
30+
linearGradientGreyVivid: `linear-gradient(90deg, #3e3e3e 0%, #b3b3b3 100%)`,
3131
transparentGreyBackground: 'rgba(126, 126, 126, 0.5)'
3232
};

0 commit comments

Comments
ย (0)