From d3aebd0b799607ba24f0a3a298afe85ced69c264 Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Wed, 28 Nov 2018 15:02:46 +0100 Subject: Renames font-files, adds font-face declaration in globalStyles --- packages/website/public/fonts/.DS_Store | Bin 0 -> 6148 bytes packages/website/public/fonts/Formular-Light.woff | Bin 0 -> 44630 bytes packages/website/public/fonts/Formular-Light.woff2 | Bin 0 -> 34337 bytes .../website/public/fonts/Formular-Regular.woff | Bin 0 -> 45102 bytes .../website/public/fonts/Formular-Regular.woff2 | Bin 0 -> 34607 bytes .../website/public/fonts/Formular/3822A0_0_0.eot | Bin 30574 -> 0 bytes .../website/public/fonts/Formular/3822A0_0_0.ttf | Bin 118572 -> 0 bytes .../website/public/fonts/Formular/3822A0_0_0.woff | Bin 44630 -> 0 bytes .../website/public/fonts/Formular/3822A0_0_0.woff2 | Bin 34337 -> 0 bytes .../website/public/fonts/Formular/3822A0_1_0.eot | Bin 30845 -> 0 bytes .../website/public/fonts/Formular/3822A0_1_0.ttf | Bin 116280 -> 0 bytes .../website/public/fonts/Formular/3822A0_1_0.woff | Bin 45102 -> 0 bytes .../website/public/fonts/Formular/3822A0_1_0.woff2 | Bin 34607 -> 0 bytes .../website/ts/@next/constants/globalStyle.tsx | 24 ++++++++++++++++++++- 14 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 packages/website/public/fonts/.DS_Store create mode 100644 packages/website/public/fonts/Formular-Light.woff create mode 100644 packages/website/public/fonts/Formular-Light.woff2 create mode 100644 packages/website/public/fonts/Formular-Regular.woff create mode 100644 packages/website/public/fonts/Formular-Regular.woff2 delete mode 100644 packages/website/public/fonts/Formular/3822A0_0_0.eot delete mode 100644 packages/website/public/fonts/Formular/3822A0_0_0.ttf delete mode 100644 packages/website/public/fonts/Formular/3822A0_0_0.woff delete mode 100644 packages/website/public/fonts/Formular/3822A0_0_0.woff2 delete mode 100644 packages/website/public/fonts/Formular/3822A0_1_0.eot delete mode 100644 packages/website/public/fonts/Formular/3822A0_1_0.ttf delete mode 100644 packages/website/public/fonts/Formular/3822A0_1_0.woff delete mode 100644 packages/website/public/fonts/Formular/3822A0_1_0.woff2 (limited to 'packages') diff --git a/packages/website/public/fonts/.DS_Store b/packages/website/public/fonts/.DS_Store new file mode 100644 index 000000000..6d9b04748 Binary files /dev/null and b/packages/website/public/fonts/.DS_Store differ diff --git a/packages/website/public/fonts/Formular-Light.woff b/packages/website/public/fonts/Formular-Light.woff new file mode 100644 index 000000000..79c774b40 Binary files /dev/null and b/packages/website/public/fonts/Formular-Light.woff differ diff --git a/packages/website/public/fonts/Formular-Light.woff2 b/packages/website/public/fonts/Formular-Light.woff2 new file mode 100644 index 000000000..6502d5da1 Binary files /dev/null and b/packages/website/public/fonts/Formular-Light.woff2 differ diff --git a/packages/website/public/fonts/Formular-Regular.woff b/packages/website/public/fonts/Formular-Regular.woff new file mode 100644 index 000000000..651364b9b Binary files /dev/null and b/packages/website/public/fonts/Formular-Regular.woff differ diff --git a/packages/website/public/fonts/Formular-Regular.woff2 b/packages/website/public/fonts/Formular-Regular.woff2 new file mode 100644 index 000000000..91cdbf29f Binary files /dev/null and b/packages/website/public/fonts/Formular-Regular.woff2 differ 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 Binary files a/packages/website/public/fonts/Formular/3822A0_0_0.eot and /dev/null differ 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 Binary files a/packages/website/public/fonts/Formular/3822A0_0_0.ttf and /dev/null differ diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.woff b/packages/website/public/fonts/Formular/3822A0_0_0.woff deleted file mode 100644 index 79c774b40..000000000 Binary files a/packages/website/public/fonts/Formular/3822A0_0_0.woff and /dev/null differ diff --git a/packages/website/public/fonts/Formular/3822A0_0_0.woff2 b/packages/website/public/fonts/Formular/3822A0_0_0.woff2 deleted file mode 100644 index 6502d5da1..000000000 Binary files a/packages/website/public/fonts/Formular/3822A0_0_0.woff2 and /dev/null differ 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 Binary files a/packages/website/public/fonts/Formular/3822A0_1_0.eot and /dev/null differ 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 Binary files a/packages/website/public/fonts/Formular/3822A0_1_0.ttf and /dev/null differ diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.woff b/packages/website/public/fonts/Formular/3822A0_1_0.woff deleted file mode 100644 index 651364b9b..000000000 Binary files a/packages/website/public/fonts/Formular/3822A0_1_0.woff and /dev/null differ diff --git a/packages/website/public/fonts/Formular/3822A0_1_0.woff2 b/packages/website/public/fonts/Formular/3822A0_1_0.woff2 deleted file mode 100644 index 91cdbf29f..000000000 Binary files a/packages/website/public/fonts/Formular/3822A0_1_0.woff2 and /dev/null differ 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; } `; -- cgit v1.2.3