Skip to content

Commit

Permalink
Merge pull request #119 from LikelionUniv/design/hackathon-partbtnCSS…
Browse files Browse the repository at this point in the history
…-fix

Design/hackathon partbtn css fix
  • Loading branch information
eastfilmm authored Jul 9, 2024
2 parents bac2c25 + 5b2ddf2 commit a155bf4
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 15 deletions.
3 changes: 1 addition & 2 deletions src/pages/landing/components/hackathon/Detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ const MoreBtn = styled.div`
line-height: 150%; /* 30px */
@media (max-width: 767px) {
/* width: clamp(360px, 3vw, 523px); */
width: 320px;
width: clamp(290px, 3vw, 523px);
height: 48px;
font-size: 16px;
}
Expand Down
22 changes: 12 additions & 10 deletions src/pages/landing/components/hackathon/HackathonPart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,9 @@ const PartButton = styled.div`
font-size: 28px;
font-style: normal;
width: 580px;
width: clamp(520px, 2vw, 580px);
height: auto;
margin-top: 120px;
margin-bottom: 148px;
cursor: pointer;
&:hover {
Expand All @@ -61,22 +58,27 @@ const PartButton = styled.div`
width: 520px;
height: 64px;
font-size: 20px;
margin-top: 40px;
margin-bottom: clamp(255px, 2vh, 446px);
width: 300px;
}
@media (max-width: 360px) {
width: 282px;
height: 48px;
font-size: 16px;
margin-top: 36px;
margin-bottom: 255px;
}
@media (max-width: 390px) {
width: 282px;
height: 48px;
font-size: 16px;
}
@media (max-width: 430px) {
width: 282px;
height: 48px;
font-size: 16px;
}
`;

const Info = styled.div`
margin: 21px 0px 20px 40px;
margin: 20px 0px 20px 40px;
font-weight: bold;
`;

Expand Down
2 changes: 2 additions & 0 deletions src/pages/landing/components/hackathon/HackathonSponsor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import logo9 from '../../../../img/landing/sponsor/logo9.svg';
import logo10 from '../../../../img/landing/sponsor/logo10.svg';
import logo11 from '../../../../img/landing/sponsor/logo11.svg';
import logo12 from '../../../../img/landing/sponsor/logo12.svg';
import { styled } from 'styled-components';

const SponsorInfo = () => {
SwiperCore.use([Autoplay]);
Expand Down Expand Up @@ -74,6 +75,7 @@ type serviceType = {
url: string;
backgroundColor?: string;
};

const serviceList: serviceType[] = [
{
id: 0,
Expand Down
1 change: 0 additions & 1 deletion src/pages/landing/components/hackathon/HackathonTimer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ const TimerContainer = styled.div`
border-radius: 24px;
height: 240px;
max-width: 1200px;
width: 100%;
margin-left: 10px;
margin-right: 10px;
Expand Down
22 changes: 21 additions & 1 deletion src/pages/landing/components/hackathon/MainInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const MainInfo = () => {
<FirstWrapper>
<Container>
<TitleImg src={title} />
<HackathonPart />
<Participation>
<HackathonPart />
</Participation>
</Container>
</FirstWrapper>
<LineWrapper>
Expand Down Expand Up @@ -127,6 +129,24 @@ const Container = styled.div`
}
`;

const Participation = styled.div`
display: flex;
justify-content: center;
margin-top: 120px;
margin-bottom: 148px;
width: 100%;
@media (max-width: 767px) {
margin-top: 40px;
margin-bottom: clamp(255px, 2vh, 446px);
}
@media (max-width: 360px) {
margin-top: 36px;
margin-bottom: 255px;
}
`;

const TitleImg = styled.img`
margin-top: 302px;
width: clamp(520px, 5wv, 926px);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/landing/components/hackathon/More.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const MoreBtn = styled.div`
line-height: 150%; /* 30px */
@media (max-width: 767px) {
width: clamp(320px, 2vw, 523px);
width: clamp(290px, 2vw, 523px);
height: 48px;
font-size: 16px;
}
Expand Down

0 comments on commit a155bf4

Please sign in to comment.