From 56fa3263743190537ca57b3a2c6955a90d6922ef Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 22:51:07 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=9E=84=EC=9B=90=EC=A7=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20linkedin=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/api/mock/about.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/api/mock/about.ts b/src/lib/api/mock/about.ts index c984ff4f..b8f287c9 100644 --- a/src/lib/api/mock/about.ts +++ b/src/lib/api/mock/about.ts @@ -61,7 +61,7 @@ const getMemberInfo = async (): Promise => ({ description: '솝트의 지금, 여러분과 함께', imageSrc: '/images/members/1.png', gmail: 'president@sopt.org', - linkedin: 'https://www.linkedin.com/in/seungwoo-cho-7a5676236/', + linkedin: 'seungwoo-cho-7a5676236', }, { id: 2, @@ -72,7 +72,7 @@ const getMemberInfo = async (): Promise => ({ imageSrc: '/images/members/2.png', gmail: 'manager@sopt.org', github: 'seeunplayer', - linkedin: 'https://www.linkedin.com/in/tina-park-755ab8230/?locale=ko_KR', + linkedin: 'tina-park-755ab8230', }, { id: 3, @@ -83,7 +83,7 @@ const getMemberInfo = async (): Promise => ({ imageSrc: '/images/members/3.png', gmail: 'makers@sopt.org', github: 'yummygyudon', - linkedin:'https://www.linkedin.com/in/yummygyudon/', + linkedin:'yummygyudon', }, { id: 4, From e323f9d209c2c1db51a43e022aa058d905c9b322 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 23:06:44 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=ED=99=9C=EB=8F=99=ED=9B=84=EA=B8=B0?= =?UTF-8?q?=20=EC=B9=B4=EB=93=9C=20=EC=85=8B=EC=A7=B8=EC=A4=84=20=EC=9E=98?= =?UTF-8?q?=EB=A6=BC=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ActivityReview/styles.ts | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/views/RecruitPage/components/ActivityReview/styles.ts b/src/views/RecruitPage/components/ActivityReview/styles.ts index 211380ea..5d0bc30e 100644 --- a/src/views/RecruitPage/components/ActivityReview/styles.ts +++ b/src/views/RecruitPage/components/ActivityReview/styles.ts @@ -108,14 +108,14 @@ export const CardWrapper = styled.div` height: 300px; padding: 38px 34px; @media (max-width: 765.9px) { - min-width: 194px; - height: 139px; - padding: 20px; + min-width: 232px; + height: 218px; + padding: 40px 26px; } @media (max-width: 1299px) and (min-width: 766px) { - min-width: 320px; - height: 300px; - padding: 38px 34px; + min-width: 310px; + height: 250px; + padding: 40px 28px; } `; @@ -131,12 +131,13 @@ export const CardTitle = styled.div` font-size: 25px; line-height: 40px; @media (max-width: 765.9px) { - font-size: 12px; - line-height: 20px; + font-size: 16px; + line-height: 25px; + letter-spacing: -0.32px; } @media (max-width: 1299px) and (min-width: 766px) { - font-size: 25px; - line-height: 40px; + font-size: 18px; + line-height: 29px; } `; @@ -147,17 +148,18 @@ export const DescWrapper = styled.div` `; export const Desc = styled.div` - color: #c8c8c8; + color: #848484; font-weight: 500; - font-size: 25px; - line-height: 40px; + font-size: 22px; + line-height: 32px; white-space: pre-wrap; @media (max-width: 765.9px) { - font-size: 12px; + font-size: 14px; + line-height: 22px; } @media (max-width: 1299px) and (min-width: 766px) { - font-size: 25px; - line-height: 40px; + font-size: 16px; + line-height: 23px; white-space: pre-wrap; } `; From 60705d3d9b2671388992d7caca31ba7502681c4d Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 23:13:33 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=2000:00:00=EC=9D=BC=EB=95=8C=20=EC=A4=84=EB=B0=94?= =?UTF-8?q?=EA=BF=88=20=EB=B0=9C=EC=83=9D=EC=9D=B4=EC=8A=88=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MainPage/components/TopBanner/style.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/MainPage/components/TopBanner/style.ts b/src/views/MainPage/components/TopBanner/style.ts index da0f98ea..c6b37286 100644 --- a/src/views/MainPage/components/TopBanner/style.ts +++ b/src/views/MainPage/components/TopBanner/style.ts @@ -93,7 +93,6 @@ export const Timer = styled.div` align-items: center; /* 아이콘 위치 이동 방지*/ - width: 128px; gap: 10px; justify-content: flex-start; From a665d2ec1ae88fd417fc6ef2a115cec29191a4fe Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 23:15:40 +0900 Subject: [PATCH 4/6] =?UTF-8?q?chore:=20=EC=A7=80=EC=9B=90=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=20=EB=B0=B0=EB=84=88=EB=93=A4=20=EB=82=98=ED=83=80?= =?UTF-8?q?=EB=82=98=EB=8A=94=20=EC=8B=9C=EA=B0=81=203/3=20=EC=9E=90?= =?UTF-8?q?=EC=A0=95=20=ED=94=BD=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useCheckTime.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/useCheckTime.ts b/src/hooks/useCheckTime.ts index a2461f0d..4f33e4cc 100644 --- a/src/hooks/useCheckTime.ts +++ b/src/hooks/useCheckTime.ts @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; export default function useCheckTime() { - const START_DATE = new Date('2024-03-02 15:00:00'); + const START_DATE = new Date('2024-03-03 00:00:00'); const [timeDiff, setTimeDiff] = useState(START_DATE.getTime() - Date.now()); useEffect(()=>{ From fbfc16fb1d6b33cf636f3b98b492b41cc3d58c3b Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 23:24:37 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20/recruit=20=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecruitPage/components/Contact/index.tsx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/RecruitPage/components/Contact/index.tsx b/src/views/RecruitPage/components/Contact/index.tsx index ab3e8645..3edaa2fd 100644 --- a/src/views/RecruitPage/components/Contact/index.tsx +++ b/src/views/RecruitPage/components/Contact/index.tsx @@ -10,14 +10,14 @@ import { contactInDisplayOrder, contactMap } from './constant'; const Contact = () => { return ( -
- + + Inquiry 문의하기 SOPT 지원에 대해 궁금한 것이 더 있나요? - + {contactInDisplayOrder.map((contact) => { const contactItem = contactMap[contact]; @@ -48,11 +48,18 @@ const Contact = () => { ); })} -
+ ); }; const Wrapper = styled.div` + display: flex; + flex-direction: column; + width: 100%; + align-items: center; +`; + +const SectionWrapper = styled.div` display: flex; flex-direction: column; gap: 8px; @@ -76,7 +83,7 @@ const ItemWrapper = styled.div` } /* 모바일 뷰 */ @media (max-width: 765.9px) { - gap: 36px; + gap: 16px; } `; From d939d243c84865a2a3f5f40316798ab1d9aa61e6 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Sat, 2 Mar 2024 23:34:48 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20/recruit=20=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/RecruitPage/components/Contact/index.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/RecruitPage/components/Contact/index.tsx b/src/views/RecruitPage/components/Contact/index.tsx index 3edaa2fd..f5520b74 100644 --- a/src/views/RecruitPage/components/Contact/index.tsx +++ b/src/views/RecruitPage/components/Contact/index.tsx @@ -107,17 +107,19 @@ const GridWrapper = styled.div` grid-template-columns: auto auto; justify-content: space-between; row-gap: 80px; + column-gap: 160px; margin-top: 80px; /* 태블릿 뷰 */ @media (max-width: 1299px) and (min-width: 766px) { - row-gap: 50px; - margin-top: 40px; + grid-template-columns: 1fr; + row-gap: 60px; + margin-top: 48px; } /* 모바일 뷰 */ @media (max-width: 765.9px) { grid-template-columns: 1fr; - row-gap: 20px; - margin-top: 20px; + row-gap: 40px; + margin-top: 30px; } `;