diff --git a/client/.storybook/preview.tsx b/client/.storybook/preview.tsx index a3c83803f..7492d7b9d 100644 --- a/client/.storybook/preview.tsx +++ b/client/.storybook/preview.tsx @@ -2,6 +2,7 @@ import type {Preview} from '@storybook/react'; import {HDesignProvider} from '../src/components/Design'; +import {css, Global} from '@emotion/react'; const preview: Preview = { parameters: { @@ -30,11 +31,23 @@ const preview: Preview = { }, }, decorators: [ - Story => ( - <HDesignProvider> - <Story /> - </HDesignProvider> - ), + Story => { + return ( + <div> + <Global + styles={css` + @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css'); + body { + font-family: 'Pretendard', sans-serif; + } + `} + /> + <HDesignProvider> + <Story /> + </HDesignProvider> + </div> + ); + }, ], }; diff --git a/client/index.html b/client/index.html index 7f96b23c5..610cb08a1 100644 --- a/client/index.html +++ b/client/index.html @@ -32,6 +32,9 @@ <link rel="canonical" href="https://haengdong.pro/" /> <link rel="icon" href="favicon.ico" type="image/x-icon" /> + <link rel="preconnect" href="https://cdn.jsdelivr.net" /> + <link rel="dns-prefetch" href="https://cdn.jsdelivr.net" /> + <link href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" rel="stylesheet" /> <script src="https://t1.kakaocdn.net/kakao_js_sdk/2.7.2/kakao.min.js" integrity="sha384-TiCUE00h649CAMonG018J2ujOgDKW/kVWlChEuu4jK2vxfAAD0eZxzCKakxg55G4" diff --git a/client/src/GlobalStyle.ts b/client/src/GlobalStyle.ts index 22c43decc..460d50ca2 100644 --- a/client/src/GlobalStyle.ts +++ b/client/src/GlobalStyle.ts @@ -2,8 +2,6 @@ import {css} from '@emotion/react'; // reset css -> index css export const GlobalStyle = css` - @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css'); - *:where(:not(html, iframe, canvas, img, svg, video, audio):not(svg *, symbol *)) { all: unset; display: revert; diff --git a/client/src/components/Design/theme/GlobalStyle.ts b/client/src/components/Design/theme/GlobalStyle.ts index b25bb94d1..afaebfc89 100644 --- a/client/src/components/Design/theme/GlobalStyle.ts +++ b/client/src/components/Design/theme/GlobalStyle.ts @@ -2,8 +2,6 @@ import {css} from '@emotion/react'; // reset css -> index css export const GlobalStyle = css` - @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css'); - *:where(:not(html, iframe, canvas, img, svg, video, audio):not(svg *, symbol *)) { all: unset; display: revert;