Skip to content

Commit 2de066d

Browse files
committed
๐Ÿ’„ design(#155): ์˜จ๋ณด๋”ฉ ๋ฐ˜์‘ํ˜• ์ˆ˜์ •
1 parent adfdd07 commit 2de066d

2 files changed

Lines changed: 76 additions & 38 deletions

File tree

โ€Žsrc/app/onboarding/page.tsxโ€Ž

Lines changed: 68 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,24 @@ const Onboarding = () => {
4949
<ContentWrapper {...handlers}>
5050
<ContentSlider style={{ transform: `translateX(${xOffset}%)` }}>
5151
<Content active={currentPage === 0}>
52-
<MainTitle>์ฑ„ํŒ…๋ฐฉ ์† ์ž ๋“ค์–ด ์žˆ๋Š” ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•˜์„ธ์š”</MainTitle>
53-
<SubTitle>
54-
์†Œ์ค‘ํ•œ ์‚ฌ๋žŒ์—๊ฒŒ ๋ฐ›์€ ๋ฉ”์‹ ์ € ํŽธ์ง€๋ฅผ
55-
<br /> ๋ ˆํ„ฐ๋ง์— ๋ชจ์•„๋‘˜ ์ˆ˜ ์žˆ์–ด์š”
56-
</SubTitle>
52+
<Text>
53+
<MainTitle>์ฑ„ํŒ…๋ฐฉ ์† ์ž ๋“ค์–ด ์žˆ๋Š” ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•˜์„ธ์š”</MainTitle>
54+
<SubTitle>
55+
์†Œ์ค‘ํ•œ ์‚ฌ๋žŒ์—๊ฒŒ ๋ฐ›์€ ๋ฉ”์‹ ์ € ํŽธ์ง€๋ฅผ
56+
<br /> ๋ ˆํ„ฐ๋ง์— ๋ชจ์•„๋‘˜ ์ˆ˜ ์žˆ์–ด์š”
57+
</SubTitle>
58+
</Text>
5759
<ContentImage src="/assets/onboarding/onboarding-pic2.png" />
5860
</Content>
5961
<Content active={currentPage === 1}>
60-
<MainTitle>๋“œ๋ž˜๊ทธํ•˜์—ฌ ์†์‰ฝ๊ฒŒ ํŽธ์ง€๋ฅผ ์ •๋ฆฌํ•ด๋ด์š”</MainTitle>
61-
<SubTitle>
62-
ํ–‰์„ฑ์€ ํด๋”์˜ ์—ญํ• ๊ณผ ๊ฐ™์•„์š”
63-
<br />
64-
์›ํ•˜๋Š” ํ–‰์„ฑ ์•ˆ์— ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•  ์ˆ˜ ์žˆ์–ด์š”
65-
</SubTitle>
62+
<Text>
63+
<MainTitle>๋“œ๋ž˜๊ทธํ•˜์—ฌ ์†์‰ฝ๊ฒŒ ํŽธ์ง€๋ฅผ ์ •๋ฆฌํ•ด๋ด์š”</MainTitle>
64+
<SubTitle>
65+
ํ–‰์„ฑ์€ ํด๋”์˜ ์—ญํ• ๊ณผ ๊ฐ™์•„์š”
66+
<br />
67+
์›ํ•˜๋Š” ํ–‰์„ฑ ์•ˆ์— ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•  ์ˆ˜ ์žˆ์–ด์š”
68+
</SubTitle>
69+
</Text>
6670
<ContentImage src="/assets/gif/onboarding_final.gif" />
6771
</Content>
6872
</ContentSlider>
@@ -78,12 +82,14 @@ const Onboarding = () => {
7882
))}
7983
</LetterImageContainer>
8084
)}
85+
</MainContainer>
86+
<ButtonWrapper>
8187
<Button
8288
buttonType="primary"
8389
text={currentPage === 0 ? '๋‹ค์Œ' : '์‹œ์ž‘ํ•˜๊ธฐ'}
8490
onClick={handleBtnClick}
8591
/>
86-
</MainContainer>
92+
</ButtonWrapper>
8793
</Container>
8894
);
8995
};
@@ -106,10 +112,10 @@ const Container = styled.div`
106112
display: flex;
107113
flex-direction: column;
108114
width: 100%;
109-
min-width: 393px;
110115
height: 100%;
116+
min-height: 550px;
111117
justify-content: space-between;
112-
color: white;
118+
color: ${theme.colors.white};
113119
background-image: url('/assets/mypage/img_background.png');
114120
background-size: cover;
115121
background-position: center;
@@ -120,13 +126,14 @@ const Container = styled.div`
120126
const MainContainer = styled.div`
121127
display: flex;
122128
flex-direction: column;
129+
width: 100%;
123130
height: 100%;
131+
min-height: 550px;
124132
align-items: center;
125133
justify-content: space-between;
126-
padding: 24px;
134+
padding: 24px 24px 80px 24px;
127135
overflow: hidden;
128136
box-sizing: border-box;
129-
width: 100%;
130137
touch-action: none; /* ๊ธฐ๋ณธ ์Šคํฌ๋กค ๋ฐฉ์ง€ */
131138
transition: transform 0.3s ease-in-out; /* ํŽ˜์ด์ง€ ์ „ํ™˜ ์• ๋‹ˆ๋ฉ”์ด์…˜ */
132139
`;
@@ -148,26 +155,46 @@ const ContentSlider = styled.div`
148155

149156
const Content = styled.div<{ active: boolean }>`
150157
width: 100%;
151-
min-height: 800px;
158+
height: 100vh;
159+
min-height: 550px;
152160
flex-shrink: 0;
153161
overflow: hidden;
154162
display: flex;
155163
flex-direction: column;
156164
align-items: center;
157-
justify-content: center;
165+
justify-content: flex-start;
158166
overflow: hidden;
159167
position: relative;
160168
`;
161169

170+
const Text = styled.div`
171+
width: 100%;
172+
flex-direction: column;
173+
align-items: center;
174+
justify-content: center;
175+
padding-top: 100px;
176+
177+
@media (max-height: 850px) {
178+
padding-top: 80px;
179+
}
180+
@media (max-height: 800px) {
181+
padding-top: 60px;
182+
}
183+
@media (max-height: 700px) {
184+
padding-top: 30px;
185+
}
186+
@media (max-height: 628px) {
187+
padding-top: 10px;
188+
}
189+
@media (max-height: 580px) {
190+
padding-top: 0px;
191+
}
192+
`;
193+
162194
const MainTitle = styled.div`
163-
color: white;
195+
color: ${theme.colors.white};
164196
text-align: center;
165-
font-family: Pretendard;
166-
font-size: 20px;
167-
font-style: normal;
168-
font-weight: 600;
169-
line-height: 34px;
170-
letter-spacing: -0.6px;
197+
${theme.fonts.title01};
171198
box-sizing: border-box;
172199
padding-top: 31px;
173200
user-select: none;
@@ -196,18 +223,20 @@ const LetterImage = styled.img`
196223
aspect-ratio: 1; // ์ •์‚ฌ๊ฐํ˜• ๋น„์œจ ์œ ์ง€
197224
border-radius: 5px;
198225
object-fit: cover;
199-
background-color: black;
200226
`;
201227

202228
const ContentImage = styled.img`
203-
width: 80%;
204-
min-width: 280px;
205-
min-height: 600px;
206-
margin-top: 36px;
229+
max-width: 346px;
230+
max-height: 60vh;
231+
height: auto;
207232
align-items: center;
208233
border-radius: 12px;
209234
border: 4px solid ${theme.colors.gray800};
210235
object-fit: contain;
236+
position: absolute;
237+
bottom: 65px;
238+
left: 50%;
239+
transform: translateX(-50%);
211240
212241
//๋“œ๋ž˜๊ทธ๋ฐฉ์ง€
213242
-webkit-user-select: none;
@@ -230,3 +259,12 @@ const LoaderContainer = styled.div`
230259
align-items: center;
231260
justify-content: center;
232261
`;
262+
263+
const ButtonWrapper = styled.div`
264+
width: 100%;
265+
padding: 0 24px;
266+
position: absolute;
267+
bottom: 24px;
268+
left: 50%;
269+
transform: translateX(-50%);
270+
`;

โ€Žsrc/app/planet/page.tsxโ€Ž

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -531,14 +531,14 @@ const PlanetPage = () => {
531531
onOrbitTouch={handleTagTouch}
532532
/>
533533
</BottomWrapper>
534-
{showTooltip && (
535-
<Tooltip
536-
message={`๋จผ์ € ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•œ ํ›„, ํ–‰์„ฑ์œผ๋กœ ๋Œ์–ด ๋‹น๊ฒจ๋ณด์„ธ์š”`}
537-
close={true}
538-
bottom="230px"
539-
onClose={() => setShowTooltip(false)}
540-
/>
541-
)}
534+
{/* {showTooltip && ( */}
535+
<Tooltip
536+
message={`๋จผ์ € ํŽธ์ง€๋ฅผ ๋ณด๊ด€ํ•œ ํ›„, ํ–‰์„ฑ์œผ๋กœ ๋Œ์–ด ๋‹น๊ฒจ๋ณด์„ธ์š”`}
537+
close={true}
538+
bottom="230px"
539+
onClose={() => setShowTooltip(false)}
540+
/>
541+
{/* )} */}
542542
</Container>
543543
</>
544544
)}

0 commit comments

Comments
ย (0)