Skip to content

Commit

Permalink
Feat: 4k 모니터 반응형 구현 및 연간 일정 중앙정렬 맞춤
Browse files Browse the repository at this point in the history
  • Loading branch information
cjy3458 committed Jan 21, 2024
1 parent f2cfce3 commit 084eef7
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 12 deletions.
3 changes: 3 additions & 0 deletions src/components/home/activity/ActivitySection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ const Wrapper = styled.div`
flex-direction: column;
align-items: center;
width: 100%;
@media (min-width: 1850px) {
margin-top: 20rem;
}
`;

const ThreeCircleWrapper = styled.div`
Expand Down
4 changes: 2 additions & 2 deletions src/components/home/activity/component/CircleComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Wrapper = styled.div`
justify-content: center;
width: 250px;
height: 250px;
@media (max-width: 1376px) {
@media (max-width: 1540px) {
width: 180px;
height: 180px;
}
Expand Down Expand Up @@ -84,7 +84,7 @@ const ImageWrapper = styled.div`
position: relative;
width: 230px;
height: 230px;
@media (max-width: 1376px) {
@media (max-width: 1540px) {
width: 160px;
height: 160px;
}
Expand Down
5 changes: 4 additions & 1 deletion src/components/home/introduction/IntroduceSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import IntroLion from '@image/소개_인사하는 사자.gif';
import FadeInComponent from '@home/common/FadeInComponent';
const text =
'중앙대학교 멋쟁이사자처럼은 중앙대 학생들로 이루어진 IT 창업 동아리입니다. \n테크 기반의 아이디어를 실현하기위해 기획, 디자인, 개발 트랙 간의 끊임없는 소통을 추구하며\n다양한 프로젝트 활동을 통해 기술적 성장을 도모하고 협업 역량을 끌어올립니다.';
const IntroduceSection = ({ innerRef }: { innerRef: MutableRefObject<null>; }) => {
const IntroduceSection = ({ innerRef }: { innerRef: MutableRefObject<null> }) => {
return (
<FadeInComponent>
<Wrapper ref={innerRef}>
Expand All @@ -35,6 +35,9 @@ const Wrapper = styled.div`
flex-direction: column;
align-items: center;
width: 100%;
@media (min-width: 1850px) {
margin-top: 20rem;
}
`;

const ImageWrapper = styled.div`
Expand Down
3 changes: 3 additions & 0 deletions src/components/home/plan/PlanSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const Wrapper = styled.div`
align-items: center;
width: 100%;
gap: 40px;
@media (min-width: 1850px) {
margin-top: 20rem;
}
`;
const AlignWrapper = styled.div`
width: 100%;
Expand Down
26 changes: 22 additions & 4 deletions src/components/home/plan/component/PlanBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ const PlanBox = () => {
return (
<BoxContainer>
<ItemWrapper>
<RowWrapper>
<DateWrapper>
{CurriculumData.map((item, i) => (
<PlanDateItem key={i} date={item.date} />
))}
</RowWrapper>
</DateWrapper>

<RowWrapper>
<PlanDotItem />
</RowWrapper>

<RowWrapper>
<TitleWrapper>
{CurriculumData.map((item, i) => (
<PlanTitleItem key={i} title={item.title} />
))}
</RowWrapper>
</TitleWrapper>
</ItemWrapper>
</BoxContainer>
);
Expand Down Expand Up @@ -83,8 +83,26 @@ const RowWrapper = styled.div`
display: flex;
width: 100%;
justify-content: space-between;
position: relative;
align-items: center;
`;

const DateWrapper = styled.div`
display: flex;
width: 106%;
margin-left: 0.5rem;
justify-content: space-between;
position: relative;
align-items: center;
`;

const TitleWrapper = styled.div`
display: flex;
width: 105%;
margin-right: 1.5rem;
justify-content: space-between;
position: relative;
align-items: center;
`;
6 changes: 3 additions & 3 deletions src/components/home/plan/component/PlanDateItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from 'styled-components';

import { Primary } from '@utils/constant/color';

const PlanDateItem = ({ date }: { date: string; }) => {
const PlanDateItem = ({ date }: { date: string }) => {
return <Date>{date}</Date>;
};

Expand All @@ -13,15 +13,15 @@ const Date = styled.div`
font-style: normal;
font-weight: 500;
font-size: 1.5rem;
@media(min-width:900px){
@media (min-width: 900px) {
line-height: 32px;
}
text-align: center;
color: ${Primary.default};
background: #e3e4ff;
border-radius: 50px;
padding: 5px 18px;
@media(max-width: 900px) {
@media (max-width: 900px) {
padding: 2px 5px;
border-radius: 15px;
font-size: 1rem;
Expand Down
7 changes: 5 additions & 2 deletions src/components/home/project/ProjectSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ProjectSection = () => {
<Wrapper>
<TitleWrapper>
<Title>프로젝트 소개</Title>
<Text>멋쟁이 사자처럼에서 탄생한 서비스들을 소개합니다. </Text>
<Text>멋쟁이사자처럼에서 탄생한 서비스들을 소개합니다. </Text>
</TitleWrapper>
<ProjectSlider />
<ButtonWrapper>
Expand All @@ -39,11 +39,14 @@ const Wrapper = styled.div`
width: 100%;
`;
const TitleWrapper = styled.div`
margin-top: 4rem;
margin-top: 6rem;
display: flex;
margin-bottom: 4rem;
align-items: center;
flex-direction: column;
@media (min-width: 1850px) {
margin-top: 30rem;
}
`;
const Title = styled.div`
font-family: 'GmarketSans';
Expand Down
3 changes: 3 additions & 0 deletions src/components/home/track/TrackSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ const TitleText = styled.div`
@media (max-width: 900px) {
font-size: 2.5rem;
}
@media (min-width: 1850px) {
margin-top: 30rem;
}
`;

const Text = styled.div`
Expand Down

0 comments on commit 084eef7

Please sign in to comment.