Skip to content

Commit d4db92e

Browse files
committed
fix: 인트로 웹뷰 반응형 적용 및 줄글 삭제
1 parent 88f8c5e commit d4db92e

File tree

2 files changed

+38
-29
lines changed

2 files changed

+38
-29
lines changed

src/pages/Main/Intro/Intro.styled.tsx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ export const AppApplyButton = styled.div`
136136
`;
137137

138138
export const Container = styled.div<{ $isMobile: boolean; $isTablet: boolean }>`
139-
height: ${({ $isMobile, $isTablet }) => ($isMobile ? "100vh" : $isTablet ? "100vh" : "90vh")};
139+
width: 100%;
140140
display: flex;
141141
flex-direction: column;
142142
align-items: flex-start;
143143
justify-content: center;
144-
height: ${({ $isMobile, $isTablet }) => ($isMobile ? "80vh" : $isTablet ? "100vh" : "90vh")};
144+
height: ${({ $isMobile, $isTablet }) => ($isMobile ? "80vh" : $isTablet ? "100vh" : "100vh")};
145145
background: linear-gradient(90deg, #102C19, #194326);
146146
padding: ${({ $isMobile }) => ($isMobile ? "0px" : "50px")};
147147
color: white;
@@ -150,10 +150,9 @@ export const Container = styled.div<{ $isMobile: boolean; $isTablet: boolean }>`
150150
export const Logo = styled.div<{ $isMobile: boolean; $isTablet: boolean }>`
151151
display: flex;
152152
align-items: center;
153-
font-size: 5vw;
153+
font-size: ${({ $isMobile, $isTablet }) => ($isMobile ? "50px" : $isTablet ? "60px" : "75px")};
154154
font-weight: 800;
155-
margin-bottom: 20px;
156-
margin-left: 50px;
155+
margin-left: ${({ $isMobile, $isTablet }) => ($isMobile || $isTablet ? "20px" : "0")};
157156
img {
158157
width: ${({ $isMobile, $isTablet }) => ($isMobile ? "100px" : $isTablet ? "140px" : "180px")};
159158
height: auto;
@@ -230,25 +229,25 @@ export const Apply = styled.div`
230229
`;
231230

232231
export const ApplyButton = styled.button<{ $isMobile: boolean; $isTablet: boolean }>`
233-
background-color: #4CAF50;
232+
background-color:rgb(74, 151, 76);
234233
color: white;
235234
border: none;
236-
padding: ${({ $isMobile, $isTablet }) => ($isMobile ? "10px 50px" : $isTablet ? "12px 65px" : "15px 80px")};
235+
padding: ${({ $isMobile, $isTablet }) => ($isMobile ? "8px 40px" : $isTablet ? "10px 55px" : "12px 70px")};
237236
border-radius: 10px;
238-
font-size: ${({ $isMobile, $isTablet }) => ($isMobile ? "18px" : $isTablet ? "22px" : "24px")};
239-
margin-top: 20px;
237+
font-size: ${({ $isMobile, $isTablet }) => ($isMobile ? "16px" : $isTablet ? "20px" : "22px")};
238+
margin-top: 100px;
240239
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.2);
241240
242241
&:hover {
243242
background-color: #388E3C;
244243
}
245244
`;
246245

247-
export const ApplyDescription = styled.div<{ $isMobile: boolean }>`
248-
font-size: ${({ $isMobile }) => ($isMobile ? "12px" : "16px")};
246+
export const ApplyDescription = styled.div<{ $isMobile: boolean; $isTablet: boolean }>`
247+
font-size: ${({ $isMobile, $isTablet }) => ($isMobile ? "13px" : $isTablet ? "17px" : "20px")};
249248
margin-top: 15px;
250249
color: #E8F5E9;
251-
text-align: center;
250+
text-align: left;
252251
`;
253252

254253
export const Bud = styled.div<{ $isMobile: boolean; $isTablet: boolean }>`

src/pages/Main/Intro/Intro.tsx

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,36 @@ SW/AI의 핵심 개념을 익히고, <S.greenHighlight>탄탄한 기초를 바
135135

136136
return (
137137
<S.Container id="about" $isMobile={isMobile} $isTablet={isTablet}>
138-
<S.Bud $isMobile={isMobile} $isTablet={isTablet}>🌱</S.Bud>
139-
<S.Description $isMobile={isMobile} $isTablet={isTablet}>
140-
미래를 준비하고 성장하는 여정, <br />
141-
Farm System에서 함께하세요.
142-
</S.Description>
143-
<S.Logo $isMobile={isMobile} $isTablet={isTablet}>
144-
<img src={logo} alt="" />
145-
Farm System
146-
</S.Logo>
147-
148-
<S.TrackList $isMobile={isMobile} $isTablet={isTablet}>
138+
<motion.div
139+
initial={{ opacity: 0, y: -50 }}
140+
animate={{ opacity: 1, y: 0 }}
141+
transition={{ duration: 1 }}
142+
>
143+
<S.Logo $isMobile={isMobile} $isTablet={isTablet}>
144+
<img src={logo} alt="Farm System Logo" />
145+
Farm System
146+
</S.Logo>
147+
</motion.div>
148+
<motion.div
149+
initial={{ opacity: 0, y: 50 }}
150+
animate={{ opacity: 1, y: 0 }}
151+
transition={{ duration: 1, delay: 0.5 }}
152+
>
153+
<S.Description $isMobile={isMobile} $isTablet={isTablet}>
154+
미래를 준비하고 성장하는 여정,
155+
Farm System에서 함께하세요.
156+
</S.Description>
157+
<S.Apply>
158+
<S.ApplyButton $isMobile={isMobile} $isTablet={isTablet} onClick={() => setPopupOpen(true)}> 지원하기 </S.ApplyButton>
159+
<S.ApplyDescription $isMobile={isMobile} $isTablet={isTablet}>2025년 2월 공개 모집 예정</S.ApplyDescription>
160+
</S.Apply>
161+
</motion.div>
162+
{/* <S.TrackList $isMobile={isMobile} $isTablet={isTablet}>
149163
SW/AI 분야에 관심있는 학생들로 구성된 <a>자율 학습 동아리</a>로, <br/>
150164
<a>Union · 게임/영상 · 보안/웹 · 사물인터넷/로봇 · 인공지능 · 빅데이터</a>의 <br/>
151165
5가지 신기술 트랙을 제공하여 학습 경험을 통해 SW/AI 역량을 배양합니다.
152-
</S.TrackList>
153-
<S.Apply>
154-
<S.ApplyButton $isMobile={isMobile} $isTablet={isTablet} onClick={() => setPopupOpen(true)}> 지원하기 </S.ApplyButton>
155-
<S.ApplyDescription $isMobile={isMobile}>2025년 2월 공개 모집 예정</S.ApplyDescription>
156-
</S.Apply>
157-
166+
</S.TrackList> */}
167+
158168
{isPopupOpen && (
159169
<Popup
160170
isOpen={isPopupOpen}

0 commit comments

Comments
 (0)