From e877e7911e546e96ed60e996af331cbc7566a54e Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 18 Dec 2024 14:28:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=ED=8F=B0=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/emotion.d.ts | 1 + src/styles/theme.ts | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/styles/emotion.d.ts b/src/styles/emotion.d.ts index d7eaaea4..64ba0320 100644 --- a/src/styles/emotion.d.ts +++ b/src/styles/emotion.d.ts @@ -68,6 +68,7 @@ declare module '@emotion/react' { mSubtitle2: SerializedStyles; mSubtitle3: SerializedStyles; mSubtitle4: SerializedStyles; + mSubtitle5: SerializedStyles; body1: SerializedStyles; body2: SerializedStyles; body3: SerializedStyles; diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 007aaf47..58f69f49 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -260,6 +260,13 @@ export const theme = { font-style: normal; line-height: 120%; /* 19.2px */ `, + mSubtitle5: css` + font-weight: 400; + font-size: 1.6rem; + font-family: 'Pretendard Variable', sans-serif; + font-style: normal; + line-height: 120%; + `, body1: css` font-weight: 500; font-size: 1.6rem; From d655912c26b6109d0b27574c390bea2db62084c8 Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 18 Dec 2024 14:28:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/Login.tsx | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx index f93d63e5..bc33cbe7 100644 --- a/src/pages/login/Login.tsx +++ b/src/pages/login/Login.tsx @@ -2,6 +2,7 @@ import styled from '@emotion/styled'; import { useLocation, useNavigate } from 'react-router-dom'; import { HeaderLogoIc, KakaoLoginBtnIc } from '../../assets/svgs'; import Spacing from '../../components/commons/Spacing'; +import { MOBILE_MEDIA_QUERY } from '../../styles/mediaQuery'; import loginIlust from '/src/assets/images/loginIlust.png'; import loginWebP from '/src/assets/webps/login.webp'; @@ -42,7 +43,7 @@ const Login = () => { - + @@ -83,11 +84,19 @@ const LoginTextBox = styled.div` const HeadText = styled.h1` color: ${({ theme }) => theme.colors.black}; ${({ theme }) => theme.fonts.title2}; + + @media ${MOBILE_MEDIA_QUERY} { + ${({ theme }) => theme.fonts.title13} + } `; const SubText = styled.p` color: ${({ theme }) => theme.colors.gray90}; ${({ theme }) => theme.fonts.subtitle4}; + + @media ${MOBILE_MEDIA_QUERY} { + ${({ theme }) => theme.fonts.mSubtitle5} + } `; const HeaderWrapper = styled.div` @@ -123,4 +132,18 @@ const LoginLayout = styled.div` background-color: ${({ theme }) => theme.colors.white}; border-radius: 0.8rem; + + @media ${MOBILE_MEDIA_QUERY} { + width: 33.5rem; + } +`; + +const LoginImg = styled.img` + width: 21.8rem; + height: 18rem; + + @media ${MOBILE_MEDIA_QUERY} { + width: 18rem; + height: 15rem; + } `; From eb6e2672b160b94bad0e1c250a15055a7954c426 Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 18 Dec 2024 14:34:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?style:=20spacing=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/Login.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx index bc33cbe7..1bc53483 100644 --- a/src/pages/login/Login.tsx +++ b/src/pages/login/Login.tsx @@ -32,7 +32,6 @@ const Login = () => { - @@ -105,11 +104,16 @@ const HeaderWrapper = styled.div` justify-content: space-between; width: 100%; height: 6.4rem; + margin-bottom: 13.2rem; padding-right: 6rem; padding-left: 6rem; background-color: ${({ theme }) => theme.colors.white}; border-bottom: 1px solid ${({ theme }) => theme.colors.gray30}; + + @media ${MOBILE_MEDIA_QUERY} { + margin-bottom: 10.8rem; + } `; const HeaderBtnLayout = styled.div`