From 0209636617ba0a6127aa034c958d6e54682e7b99 Mon Sep 17 00:00:00 2001
From: seohee0112
Date: Sat, 9 Jul 2022 00:53:53 +0900
Subject: [PATCH 01/12] =?UTF-8?q?[=20feat=20]=20.env=20=EB=AC=B4=EC=8B=9C?=
=?UTF-8?q?=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 737d872..ec1856b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ yarn-error.log*
.pnpm-debug.log*
# local env files
+.env
.env*.local
# vercel
From 062e8cd052f823602d23215209db35c6194a262a Mon Sep 17 00:00:00 2001
From: seohee0112
Date: Sat, 9 Jul 2022 00:54:10 +0900
Subject: [PATCH 02/12] =?UTF-8?q?[=20style=20]=20=EC=8A=A4=ED=83=80?=
=?UTF-8?q?=EC=9D=BC=20=EC=B4=88=EA=B8=B0=EC=84=B8=ED=8C=85=20=EC=99=84?=
=?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
styles/emotion.d.ts | 45 +++++++++++++++++++++++++---
styles/theme.ts | 72 ++++++++++++++++++++++++++++++++++++---------
2 files changed, 99 insertions(+), 18 deletions(-)
diff --git a/styles/emotion.d.ts b/styles/emotion.d.ts
index 3f00078..79e1490 100644
--- a/styles/emotion.d.ts
+++ b/styles/emotion.d.ts
@@ -1,8 +1,45 @@
-import { SerializedStyles } from '@emotion/utils';
+import { SerializedStyles } from '@emotion/react';
-declare module '@emotion/utils' {
+declare module '@emotion/react' {
export interface Theme {
- colors: {};
- fonts: {};
+ colors: {
+ mainGreen: string;
+ mainDarkgreen: string;
+ subYellow: string;
+ orange: string;
+ blue: string;
+ lightGreen: string;
+ white: string;
+ gray001: string;
+ gray002: string;
+ gray003: string;
+ gray004: string;
+ gray005: string;
+ gray006: string;
+ gray007: string;
+ gray008: string;
+ gray009: string;
+ black: string;
+ };
+ fonts: {
+ t1_28_medium_150: SerializedStyles;
+ t2_26_semibold_150: SerializedStyles;
+ t3_19_bold_140: SerializedStyles;
+ t3_19_medium_130: SerializedStyles;
+ t4_18_semibold_150: SerializedStyles;
+ t4_18_regular_150: SerializedStyles;
+ b1_20_bold_140: SerializedStyles;
+ b2_18_bold_140: SerializedStyles;
+ b2_18_medium_130: SerializedStyles;
+ b2_18_regular_130: SerializedStyles;
+ b3_16_semibold_140: SerializedStyles;
+ b4_15_semibold_146: SerializedStyles;
+ b5_14_semibold_140: SerializedStyles;
+ b5_14_medium_140: SerializedStyles;
+ b6_13_medium_120: SerializedStyles;
+ b7_12_bold_120: SerializedStyles;
+ b7_12_medium_140: SerializedStyles;
+ b7_12_regular_120: SerializedStyles;
+ };
}
}
diff --git a/styles/theme.ts b/styles/theme.ts
index a67ba33..e068759 100644
--- a/styles/theme.ts
+++ b/styles/theme.ts
@@ -1,33 +1,77 @@
import { css, Theme } from '@emotion/react';
-const colors = {};
+const colors = {
+ mainGreen: '#1DB981',
+ mainDarkgreen: '#1D8669',
+ subYellow: '#FFE766',
+ orange: '#FF9D55',
+ blue: '#4484FF',
+ lightGreen: '#F5FFF0',
+ white: '#FFFFFF',
+ gray001: '#FCFCFC',
+ gray002: '#F8F8F8',
+ gray003: '#E8E8E8',
+ gray004: '#E2E2E2',
+ gray005: '#D9D9D9',
+ gray006: '#A9A9A9',
+ gray007: '#9D9D9D',
+ gray008: '#787878',
+ gray009: '#636363',
+ black: '#636363',
+};
interface Font {
weight: 400 | 500 | 600 | 700 | 800;
size: number;
- height: 'default' | 'long';
- spacing: 'default' | 'close';
-}
-
-interface TempFont extends Omit {
height: number;
+ spacing: 0;
}
-const fontHeight = {
- default: 1.3,
- long: 1.5,
-} as const;
-
-function FONT({ weight, size, height, spacing }: Font | TempFont) {
+function FONT({ weight, size, height, spacing }: Font) {
return css`
font-family: Pretendard;
font-weight: ${weight};
font-size: ${size}rem;
- line-height: ${typeof height === 'number' ? height : fontHeight[height]};
+ line-height: ${height}%;
+ spacing: ${spacing}%;
`;
}
-const fonts = {};
+const fonts = {
+ t1_28_medium_150: FONT({ weight: 500, size: 2.8, height: 4.2, spacing: 0 }),
+ t2_26_semibold_150: FONT({ weight: 600, size: 2.6, height: 3.9, spacing: 0 }),
+ t3_19_bold_140: FONT({ weight: 700, size: 1.9, height: 2.66, spacing: 0 }),
+ t3_19_medium_130: FONT({ weight: 500, size: 1.8, height: 2.47, spacing: 0 }),
+ t4_18_semibold_150: FONT({ weight: 600, size: 1.8, height: 2.7, spacing: 0 }),
+ t4_18_regular_150: FONT({ weight: 400, size: 1.8, height: 2.7, spacing: 0 }),
+ b1_20_bold_140: FONT({ weight: 700, size: 2, height: 2.8, spacing: 0 }),
+ b2_18_bold_140: FONT({ weight: 700, size: 1.8, height: 2.52, spacing: 0 }),
+ b2_18_medium_130: FONT({ weight: 500, size: 1.8, height: 2.34, spacing: 0 }),
+ b2_18_regular_130: FONT({ weight: 400, size: 1.8, height: 2.34, spacing: 0 }),
+ b3_16_semibold_140: FONT({
+ weight: 600,
+ size: 1.6,
+ height: 2.24,
+ spacing: 0,
+ }),
+ b4_15_semibold_146: FONT({
+ weight: 600,
+ size: 1.5,
+ height: 2.19,
+ spacing: 0,
+ }),
+ b5_14_semibold_140: FONT({
+ weight: 600,
+ size: 1.4,
+ height: 1.96,
+ spacing: 0,
+ }),
+ b5_14_medium_140: FONT({ weight: 500, size: 1.4, height: 1.96, spacing: 0 }),
+ b6_13_medium_120: FONT({ weight: 500, size: 1.3, height: 1.56, spacing: 0 }),
+ b7_12_bold_120: FONT({ weight: 700, size: 1.2, height: 1.44, spacing: 0 }),
+ b7_12_medium_140: FONT({ weight: 500, size: 1.2, height: 1.68, spacing: 0 }),
+ b7_12_regular_120: FONT({ weight: 400, size: 1.2, height: 1.44, spacing: 0 }),
+};
const theme: Theme = {
colors,
From 0a7d0b7bc146e2e74c154fa248f8d3aecd8aece4 Mon Sep 17 00:00:00 2001
From: seohee0112
Date: Sat, 9 Jul 2022 00:54:39 +0900
Subject: [PATCH 03/12] =?UTF-8?q?[=20chore=20]=20=EC=8A=A4=ED=83=80?=
=?UTF-8?q?=EC=9D=BC=20=EC=B4=88=EA=B8=B0=EC=84=B8=ED=8C=85=20=EC=A0=90?=
=?UTF-8?q?=EA=B2=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 2 +-
pages/main.tsx | 27 ++++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 52423a2..b590a40 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -11,5 +11,5 @@ const StHeaderWrapper = styled.header`
width: 100%;
height: 11.4rem;
- background-color: #31cc94;
+ background-color: ${({ theme }) => theme.colors.mainGreen};
`;
diff --git a/pages/main.tsx b/pages/main.tsx
index 572cef1..cd954dd 100644
--- a/pages/main.tsx
+++ b/pages/main.tsx
@@ -1,3 +1,28 @@
+import styled from '@emotion/styled';
+
export default function main() {
- return 메인입니다
;
+ return (
+ <>
+
+
+ 이번주 인기 장난감
+
+
+ >
+ );
}
+
+const StMainSection = styled.section`
+ display: flex;
+ flex-direction: column;
+
+ align-items: center;
+`;
+const StConceptArticle = styled.article`
+ margin-top: 6.7rem;
+`;
+const StConceptTitle = styled.div`
+ padding-bottom: 5rem;
+
+ ${({ theme }) => theme.fonts.t2_26_semibold_150};
+`;
From f7f5e69a73c0aab9cebfcee8d8e5a6c594eb8bed Mon Sep 17 00:00:00 2001
From: seohee0112
Date: Sat, 9 Jul 2022 15:20:19 +0900
Subject: [PATCH 04/12] =?UTF-8?q?[=20style=20]=20%=20->=20rem=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
styles/theme.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/styles/theme.ts b/styles/theme.ts
index e068759..f8ff282 100644
--- a/styles/theme.ts
+++ b/styles/theme.ts
@@ -32,7 +32,7 @@ function FONT({ weight, size, height, spacing }: Font) {
font-family: Pretendard;
font-weight: ${weight};
font-size: ${size}rem;
- line-height: ${height}%;
+ line-height: ${height}rem;
spacing: ${spacing}%;
`;
}
From 16a2ff4c26fdff659814bd0b4dcc9406b6c26a06 Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Sat, 9 Jul 2022 18:35:48 +0900
Subject: [PATCH 05/12] =?UTF-8?q?[=20=20feat=20=20]=20Header=20=EB=A0=88?=
=?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 118 ++++++++++++++++++++++++-
public/assets/icons/index.ts | 3 +-
public/assets/icons/noriHeaderIcon.svg | 11 +++
public/assets/icons/searchIcon.svg | 3 +
4 files changed, 131 insertions(+), 4 deletions(-)
create mode 100644 public/assets/icons/noriHeaderIcon.svg
create mode 100644 public/assets/icons/searchIcon.svg
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 52423a2..5f3a1dd 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -1,15 +1,127 @@
import styled from '@emotion/styled';
+import { useRouter } from 'next/router';
+import { IcNoriHeaderLogo, IcSearchIcon } from '../../public/assets/icons';
+
export default function Header() {
- return ;
+ const router = useRouter();
+
+ return (
+
+
+
+ 고객센터 | 마이페이지 | 로그인
+
+
+
+ router.push('/')} />
+
+
+
+
+
+
+ router.push('/toyView')}>
+ 상품보기
+
+ router.push('/community')}>
+ 커뮤니티
+
+ ABOUT
+
+
+
+
+ );
}
const StHeaderWrapper = styled.header`
position: sticky;
- padding-top: 32px;
- top: -32px;
+ top: -3.2rem;
width: 100%;
height: 11.4rem;
background-color: #31cc94;
+ color: #ffffff;
+`;
+
+const StTopLink = styled.div`
+ display: flex;
+ align-items: center;
+
+ padding: 0rem;
+ padding-top: 0.7rem;
+ padding-left: 75%;
+
+ font-style: normal;
+ font-weight: 400;
+ font-size: 1.2rem;
+ line-height: 1.6rem;
+`;
+
+const StHeaderContents = styled.section`
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+
+ width: 100%;
+ margin-top: 2.9rem;
+`;
+
+const StSearchWrapper = styled.div`
+ display: flex;
+ align-items: center;
+
+ gap: 4.8rem;
+`;
+
+const StSearchBar = styled.div`
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+
+ width: 28.5rem;
+ height: 4.2rem;
+
+ background: rgba(255, 255, 255, 0.14);
+ border-radius: 0.8rem;
+
+ input {
+ height: 2.2rem;
+ width: 22rem;
+
+ color: rgba(255, 255, 255, 0.75);
+ font-family: 'Pretendard';
+ font-style: normal;
+ font-weight: 500;
+ font-size: 1.6rem;
+ line-height: 140%;
+
+ &::placeholder {
+ color: rgba(255, 255, 255, 0.75);
+ }
+
+ :focus::placeholder {
+ opacity: 0;
+ }
+ }
+`;
+
+const StMenu = styled.div`
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+
+ width: 27.3rem;
+ height: 2.6rem;
+ gap: 3.2rem;
+
+ line-height: 2.6rem;
+`;
+
+const StMenuBtn = styled.button`
+ color: #ffffff;
+ font-weight: 500;
+ font-size: 1.8rem;
`;
diff --git a/public/assets/icons/index.ts b/public/assets/icons/index.ts
index 746631e..7362380 100644
--- a/public/assets/icons/index.ts
+++ b/public/assets/icons/index.ts
@@ -1 +1,2 @@
-export { default as IcNoriLogo } from './noriLogoIcon.svg';
+export { default as IcNoriHeaderLogo } from './noriHeaderIcon.svg';
+export {default as IcSearchIcon } from './searchIcon.svg';
diff --git a/public/assets/icons/noriHeaderIcon.svg b/public/assets/icons/noriHeaderIcon.svg
new file mode 100644
index 0000000..f094129
--- /dev/null
+++ b/public/assets/icons/noriHeaderIcon.svg
@@ -0,0 +1,11 @@
+
diff --git a/public/assets/icons/searchIcon.svg b/public/assets/icons/searchIcon.svg
new file mode 100644
index 0000000..35fed2d
--- /dev/null
+++ b/public/assets/icons/searchIcon.svg
@@ -0,0 +1,3 @@
+
From 7ebcc3481f42cdfd4f4fe96001d228f7bc959d29 Mon Sep 17 00:00:00 2001
From: seohee0112
Date: Sun, 10 Jul 2022 08:24:32 +0900
Subject: [PATCH 06/12] =?UTF-8?q?[=20style=20]=20=EC=8A=A4=ED=83=80?=
=?UTF-8?q?=EC=9D=BC=20=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
styles/emotion.d.ts | 5 +++++
styles/theme.ts | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/styles/emotion.d.ts b/styles/emotion.d.ts
index 79e1490..cc738b6 100644
--- a/styles/emotion.d.ts
+++ b/styles/emotion.d.ts
@@ -10,6 +10,9 @@ declare module '@emotion/react' {
blue: string;
lightGreen: string;
white: string;
+ white_opacity_75: string;
+ white_opacity_40: string;
+ white_opacity_14: string;
gray001: string;
gray002: string;
gray003: string;
@@ -32,7 +35,9 @@ declare module '@emotion/react' {
b2_18_bold_140: SerializedStyles;
b2_18_medium_130: SerializedStyles;
b2_18_regular_130: SerializedStyles;
+ b3_16_bold_140: SerializedStyles;
b3_16_semibold_140: SerializedStyles;
+ b3_16_medium_140: SerializedStyles;
b4_15_semibold_146: SerializedStyles;
b5_14_semibold_140: SerializedStyles;
b5_14_medium_140: SerializedStyles;
diff --git a/styles/theme.ts b/styles/theme.ts
index f8ff282..91dada5 100644
--- a/styles/theme.ts
+++ b/styles/theme.ts
@@ -8,6 +8,10 @@ const colors = {
blue: '#4484FF',
lightGreen: '#F5FFF0',
white: '#FFFFFF',
+ white_opacity_75: 'rgba(255, 255, 255, 0.75)',
+ white_opacity_40: 'rgba(255, 255, 255, 0.4)',
+ white_opacity_14: 'rgba(255, 255, 255, 0.14)',
+
gray001: '#FCFCFC',
gray002: '#F8F8F8',
gray003: '#E8E8E8',
@@ -48,12 +52,14 @@ const fonts = {
b2_18_bold_140: FONT({ weight: 700, size: 1.8, height: 2.52, spacing: 0 }),
b2_18_medium_130: FONT({ weight: 500, size: 1.8, height: 2.34, spacing: 0 }),
b2_18_regular_130: FONT({ weight: 400, size: 1.8, height: 2.34, spacing: 0 }),
+ b3_16_bold_140: FONT({ weight: 700, size: 1.6, height: 2.24, spacing: 0 }),
b3_16_semibold_140: FONT({
weight: 600,
size: 1.6,
height: 2.24,
spacing: 0,
}),
+ b3_16_medium_140: FONT({ weight: 500, size: 1.6, height: 2.24, spacing: 0 }),
b4_15_semibold_146: FONT({
weight: 600,
size: 1.5,
From 4ca4f7fa3e596230336774ad156e19dc32c6d592 Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 11:14:36 +0900
Subject: [PATCH 07/12] =?UTF-8?q?[=20=20chore=20=20]=20=20=EB=9D=84?=
=?UTF-8?q?=EC=96=B4=EC=93=B0=EA=B8=B0,=20input=20type=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
---
components/common/Header.tsx | 10 ++-----
public/assets/icons/noriLogoIcon.svg | 43 ----------------------------
2 files changed, 2 insertions(+), 51 deletions(-)
delete mode 100644 public/assets/icons/noriLogoIcon.svg
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 5f3a1dd..0fadc08 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled';
-import { useRouter } from 'next/router';
+import { useRouter, Link } from 'next/router';
import { IcNoriHeaderLogo, IcSearchIcon } from '../../public/assets/icons';
export default function Header() {
@@ -16,7 +16,7 @@ export default function Header() {
router.push('/')} />
-
+
@@ -44,7 +44,6 @@ const StHeaderWrapper = styled.header`
background-color: #31cc94;
color: #ffffff;
`;
-
const StTopLink = styled.div`
display: flex;
align-items: center;
@@ -58,7 +57,6 @@ const StTopLink = styled.div`
font-size: 1.2rem;
line-height: 1.6rem;
`;
-
const StHeaderContents = styled.section`
display: flex;
justify-content: space-around;
@@ -67,14 +65,12 @@ const StHeaderContents = styled.section`
width: 100%;
margin-top: 2.9rem;
`;
-
const StSearchWrapper = styled.div`
display: flex;
align-items: center;
gap: 4.8rem;
`;
-
const StSearchBar = styled.div`
display: flex;
justify-content: space-evenly;
@@ -106,7 +102,6 @@ const StSearchBar = styled.div`
}
}
`;
-
const StMenu = styled.div`
display: flex;
flex-direction: row;
@@ -119,7 +114,6 @@ const StMenu = styled.div`
line-height: 2.6rem;
`;
-
const StMenuBtn = styled.button`
color: #ffffff;
font-weight: 500;
diff --git a/public/assets/icons/noriLogoIcon.svg b/public/assets/icons/noriLogoIcon.svg
deleted file mode 100644
index fa2af80..0000000
--- a/public/assets/icons/noriLogoIcon.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
From fd8fa9bc449ff08cacf83a08992ee8a1900baf4d Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 11:23:58 +0900
Subject: [PATCH 08/12] =?UTF-8?q?[=20=20refactor=20=20]=20=20=EB=A9=94?=
=?UTF-8?q?=EB=89=B4=20Link=20=EC=A0=81=EC=9A=A9=ED=95=98=EC=97=AC=20Route?=
=?UTF-8?q?=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 0fadc08..220d775 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -1,5 +1,6 @@
import styled from '@emotion/styled';
-import { useRouter, Link } from 'next/router';
+import { useRouter } from 'next/router';
+import Link from 'next/link';
import { IcNoriHeaderLogo, IcSearchIcon } from '../../public/assets/icons';
export default function Header() {
@@ -20,12 +21,12 @@ export default function Header() {
- router.push('/toyView')}>
- 상품보기
-
- router.push('/community')}>
- 커뮤니티
-
+
+ 상품보기
+
+
+ 커뮤니티
+
ABOUT
@@ -114,7 +115,7 @@ const StMenu = styled.div`
line-height: 2.6rem;
`;
-const StMenuBtn = styled.button`
+const StMenuBtn = styled.a`
color: #ffffff;
font-weight: 500;
font-size: 1.8rem;
From 3a2891957750dde2bd717cb823001852a47092e7 Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 11:29:46 +0900
Subject: [PATCH 09/12] =?UTF-8?q?[=20=20chore=20=20]=20=20svg=20=EC=97=90?=
=?UTF-8?q?=20Link=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 220d775..1ac6655 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -14,17 +14,19 @@ export default function Header() {
- router.push('/')} />
+
+
+
-
+
상품보기
-
+
커뮤니티
ABOUT
From dd81a6ba039f692b6c9609b3eff65485dea266f3 Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 12:08:26 +0900
Subject: [PATCH 10/12] =?UTF-8?q?[=20=20style=20=20]=20=20=EC=8A=A4?=
=?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=86=8D=EC=84=B1(=EC=BB=AC=EB=9F=AC,=20?=
=?UTF-8?q?=ED=8F=B0=ED=8A=B8)=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index d67de29..2cefef2 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -1,11 +1,8 @@
import styled from '@emotion/styled';
-import { useRouter } from 'next/router';
import Link from 'next/link';
import { IcNoriHeaderLogo, IcSearchIcon } from '../../public/assets/icons';
export default function Header() {
- const router = useRouter();
-
return (
@@ -54,11 +51,13 @@ const StTopLink = styled.div`
padding: 0rem;
padding-top: 0.7rem;
padding-left: 75%;
+ a {
+ ${({ theme }) => theme.fonts.b7_12_regular_120}
- font-style: normal;
- font-weight: 400;
- font-size: 1.2rem;
- line-height: 1.6rem;
+ &:hover {
+ ${({ theme }) => theme.fonts.b7_12_bold_120}
+ }
+ }
`;
const StHeaderContents = styled.section`
display: flex;
@@ -90,11 +89,7 @@ const StSearchBar = styled.div`
width: 22rem;
color: ${({ theme }) => theme.colors.white_opacity_75};
- font-family: 'Pretendard';
- font-style: normal;
- font-weight: 500;
- font-size: 1.6rem;
- line-height: 140%;
+ ${({ theme }) => theme.fonts.b3_16_medium_140}
&::placeholder {
color: ${({ theme }) => theme.colors.white_opacity_75};
@@ -118,7 +113,11 @@ const StMenu = styled.div`
line-height: 2.6rem;
`;
const StMenuBtn = styled.a`
+ ${({ theme }) => theme.fonts.t4_18_regular_150}
+
color: ${({ theme }) => theme.colors.white};
- font-weight: 500;
- font-size: 1.8rem;
+
+ &:hover {
+ ${({ theme }) => theme.fonts.t4_18_semibold_150};
+ }
`;
From c9e6c0b46b41cb7fc265187ec09930af2b97f2f8 Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 12:52:11 +0900
Subject: [PATCH 11/12] =?UTF-8?q?[=20=20chore=20=20]=20=20Link=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 2cefef2..54ee6e8 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -11,7 +11,7 @@ export default function Header() {
-
+
From 86a239f2bebd82f04cd4e952a2b11df7db04917b Mon Sep 17 00:00:00 2001
From: Brokyeom
Date: Mon, 11 Jul 2022 13:15:45 +0900
Subject: [PATCH 12/12] =?UTF-8?q?[=20=20chore=20=20]=20cursor=20=EC=86=8D?=
=?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/common/Header.tsx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/common/Header.tsx b/components/common/Header.tsx
index 54ee6e8..1dda4e4 100644
--- a/components/common/Header.tsx
+++ b/components/common/Header.tsx
@@ -54,6 +54,8 @@ const StTopLink = styled.div`
a {
${({ theme }) => theme.fonts.b7_12_regular_120}
+ cursor: pointer;
+
&:hover {
${({ theme }) => theme.fonts.b7_12_bold_120}
}
@@ -120,4 +122,5 @@ const StMenuBtn = styled.a`
&:hover {
${({ theme }) => theme.fonts.t4_18_semibold_150};
}
+ cursor: pointer;
`;