Renames font-files, adds font-face declaration in globalStyles

10 files changed, 23 insertions, 1 deletions

diff --git a/packages/website/public/fonts/.DS_Store b/packages/website/public/fonts/.DS_Store
new file mode 100644
index 000000000..6d9b04748
--- /dev/null
+++ b/packages/website/public/fonts/.DS_Store
diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.woff b/packages/website/public/fonts/Formular-Light.woff
index 79c774b40..79c774b40 100644
--- a/packages/website/public/fonts/Formular/3822A0_0_0.woff
+++ b/packages/website/public/fonts/Formular-Light.woff
diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.woff2 b/packages/website/public/fonts/Formular-Light.woff2
index 6502d5da1..6502d5da1 100644
--- a/packages/website/public/fonts/Formular/3822A0_0_0.woff2
+++ b/packages/website/public/fonts/Formular-Light.woff2
diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.woff b/packages/website/public/fonts/Formular-Regular.woff
index 651364b9b..651364b9b 100644
--- a/packages/website/public/fonts/Formular/3822A0_1_0.woff
+++ b/packages/website/public/fonts/Formular-Regular.woff
diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.woff2 b/packages/website/public/fonts/Formular-Regular.woff2
index 91cdbf29f..91cdbf29f 100644
--- a/packages/website/public/fonts/Formular/3822A0_1_0.woff2
+++ b/packages/website/public/fonts/Formular-Regular.woff2
diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.eot b/packages/website/public/fonts/Formular/3822A0_0_0.eot
deleted file mode 100644
index d0976f98d..000000000
--- a/packages/website/public/fonts/Formular/3822A0_0_0.eot
+++ /dev/null
diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.ttf b/packages/website/public/fonts/Formular/3822A0_0_0.ttf
deleted file mode 100644
index 14c79fbb6..000000000
--- a/packages/website/public/fonts/Formular/3822A0_0_0.ttf
+++ /dev/null
diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.eot b/packages/website/public/fonts/Formular/3822A0_1_0.eot
deleted file mode 100644
index 4cbeff445..000000000
--- a/packages/website/public/fonts/Formular/3822A0_1_0.eot
+++ /dev/null
diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.ttf b/packages/website/public/fonts/Formular/3822A0_1_0.ttf
deleted file mode 100644
index e34b531ab..000000000
--- a/packages/website/public/fonts/Formular/3822A0_1_0.ttf
+++ /dev/null
diff --git a/packages/website/ts/@next/constants/globalStyle.tsx b/packages/website/ts/@next/constants/globalStyle.tsx
index 271dd2545..46f927673 100644
--- a/packages/website/ts/@next/constants/globalStyle.tsx
+++ b/packages/website/ts/@next/constants/globalStyle.tsx
@@ -1,5 +1,6 @@
 import { createGlobalStyle } from 'styled-components';
 import { cssReset } from 'ts/@next/constants/cssReset';
+import { colors } from 'ts/style/colors';
 
 
 // Not sure if cssReset is already imported into index.tsx
@@ -8,8 +9,29 @@ import { cssReset } from 'ts/@next/constants/cssReset';
 const GlobalStyles = createGlobalStyle`
   ${cssReset};
 
+  @font-face {
+    font-family: "Formular";
+    src: url("/public/fonts/Formular-Light.woff2") format("woff2"), url("/public/fonts/Formular-Light.woff") format("woff");
+    font-weight: 300;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: "Formular";
+    src: url("/public/fonts/Formular-Regular.woff2") format("woff2"), url("/public/fonts/Formular-Regular.woff") format("woff");
+    font-weight: 500;
+    font-display: swap;
+  }
+
   html {
-    background-color: red;
+    font-size: 17px;
+    background-color: ${colors.backgroundDark};
+  }
+
+  body {
+    font-family: 'Formular', sans-serif !important;
+    -webkit-font-smoothing: antialiased;
+    color: #fff;
   }
 `;