From 6bbd4640ad93ad6b6f3934d7594f9dd31351b41e Mon Sep 17 00:00:00 2001 From: Albert Folch Date: Tue, 4 Apr 2023 15:58:44 +0200 Subject: [PATCH 1/2] fix: custom font --- src/lib/styles/GlobalStyle.tsx | 5 ++++- src/lib/types/externals.d.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/styles/GlobalStyle.tsx b/src/lib/styles/GlobalStyle.tsx index 36752c3fc..9bd0e2ed1 100644 --- a/src/lib/styles/GlobalStyle.tsx +++ b/src/lib/styles/GlobalStyle.tsx @@ -1,5 +1,8 @@ +import "../../assets/fonts/neuropolitical_rg.ttf"; + import { createGlobalStyle } from "styled-components"; +import barlowRegular from "../../assets/fonts/Barlow-Regular.ttf"; import { breakpoint } from "../../lib/styles/breakpoint"; import { colors } from "../../lib/styles/colors"; @@ -19,7 +22,7 @@ const GlobalStyle = createGlobalStyle<{ }>` @font-face { font-family: barlow; - src: url(src/assets/fonts/Barlow-Regular.ttf); + src: url(${barlowRegular}); font-weight: normal; } * { diff --git a/src/lib/types/externals.d.ts b/src/lib/types/externals.d.ts index 7c5b8894e..ec5f4ff93 100644 --- a/src/lib/types/externals.d.ts +++ b/src/lib/types/externals.d.ts @@ -1,3 +1,5 @@ declare module "@metamask/jazzicon"; declare module "pretty"; + +declare module "*.ttf"; From d9b1cc41f168d3fdbb362326db41a4c210cc606f Mon Sep 17 00:00:00 2001 From: Albert Folch Date: Tue, 4 Apr 2023 16:15:24 +0200 Subject: [PATCH 2/2] refactor: remove wrong import --- src/lib/styles/GlobalStyle.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/styles/GlobalStyle.tsx b/src/lib/styles/GlobalStyle.tsx index 9bd0e2ed1..643f7bb09 100644 --- a/src/lib/styles/GlobalStyle.tsx +++ b/src/lib/styles/GlobalStyle.tsx @@ -1,5 +1,3 @@ -import "../../assets/fonts/neuropolitical_rg.ttf"; - import { createGlobalStyle } from "styled-components"; import barlowRegular from "../../assets/fonts/Barlow-Regular.ttf";