From 00740086862aa13d2897ff50c6ab32dede44329a Mon Sep 17 00:00:00 2001 From: hae-on Date: Tue, 19 Sep 2023 21:42:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=ED=8F=B0=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=98=EA=B3=A0=20preload=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/public/index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/public/index.html b/frontend/public/index.html index d6d5ee3aa..5348344ae 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -18,6 +18,13 @@ + 펀잇 From d5aac09e6f3558a2045504fbb4d35b48566ea2d5 Mon Sep 17 00:00:00 2001 From: hae-on Date: Wed, 20 Sep 2023 15:12:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20font=20family=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/font.ts | 14 ++++++++++++++ frontend/src/styles/index.ts | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 frontend/src/styles/font.ts diff --git a/frontend/src/styles/font.ts b/frontend/src/styles/font.ts new file mode 100644 index 000000000..52122fdf7 --- /dev/null +++ b/frontend/src/styles/font.ts @@ -0,0 +1,14 @@ +import { css } from 'styled-components'; + +const fonts = css` + body, + button, + input, + textarea { + font-family: 'Pretendard Variable', Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, + 'Helvetica Neue', 'Segoe UI', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', + 'Segoe UI Emoji', 'Segoe UI Symbol', sans-serif; + } +`; + +export default fonts; diff --git a/frontend/src/styles/index.ts b/frontend/src/styles/index.ts index 56318656e..e90d4bd13 100644 --- a/frontend/src/styles/index.ts +++ b/frontend/src/styles/index.ts @@ -1,6 +1,10 @@ import { createGlobalStyle } from 'styled-components'; +import fonts from './font'; + const GlobalStyle = createGlobalStyle` +${fonts} + #root { position: absolute; top: 0;