diff --git a/client/gatsby-browser.js b/client/gatsby-browser.js index 5ec0f0c544..32aa254ac2 100644 --- a/client/gatsby-browser.js +++ b/client/gatsby-browser.js @@ -6,9 +6,6 @@ import { createStore } from './src/redux/createStore'; import AppMountNotifier from './src/components/AppMountNotifier'; import layoutSelector from './utils/gatsby/layoutSelector'; -require('typeface-lato'); -require('typeface-roboto-mono'); - const store = createStore(); export const wrapRootElement = ({ element }) => { diff --git a/client/package-lock.json b/client/package-lock.json index 0a6e4ca088..28bdabf132 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -19643,16 +19643,6 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, - "typeface-lato": { - "version": "0.0.75", - "resolved": "https://registry.npmjs.org/typeface-lato/-/typeface-lato-0.0.75.tgz", - "integrity": "sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw==" - }, - "typeface-roboto-mono": { - "version": "0.0.75", - "resolved": "https://registry.npmjs.org/typeface-roboto-mono/-/typeface-roboto-mono-0.0.75.tgz", - "integrity": "sha512-dYfyXd6HrKyMC/PuBAAtay0tZKsBrzxIW/fBY325vLxFfi/IDKSuyTkWxkU4lyZV6KPHetFnJ661PNXzz2FS/w==" - }, "typescript-compare": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz", diff --git a/client/package.json b/client/package.json index 8bfb5fcbf0..4213012a3b 100644 --- a/client/package.json +++ b/client/package.json @@ -73,8 +73,6 @@ "sanitize-html": "^1.20.0", "sass.js": "^0.11.0", "store": "^2.0.12", - "typeface-lato": "0.0.75", - "typeface-roboto-mono": "0.0.75", "validator": "^10.11.0" }, "keywords": [ diff --git a/client/src/components/FourOhFour/404.css b/client/src/components/FourOhFour/404.css index 29f6c7ca87..cafa692e47 100644 --- a/client/src/components/FourOhFour/404.css +++ b/client/src/components/FourOhFour/404.css @@ -30,7 +30,7 @@ .quote-wrapper span { font-size: 50px; - font-weight: 600; + font-weight: 700; color: var(--tertiary-color); font-family: 'Arial', sans-serif; font-style: normal; diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js index 56163526a2..dec5db3a52 100644 --- a/client/src/components/layouts/Default.js +++ b/client/src/components/layouts/Default.js @@ -24,6 +24,7 @@ import Flash from '../Flash'; import Header from '../Header'; import Footer from '../Footer'; +import './fonts.css'; import './global.css'; import './variables.css'; diff --git a/client/src/components/layouts/fonts.css b/client/src/components/layouts/fonts.css new file mode 100644 index 0000000000..3b07b4de11 --- /dev/null +++ b/client/src/components/layouts/fonts.css @@ -0,0 +1,60 @@ +@font-face { + font-family: 'Lato'; + src: url('../../../static/fonts/lato/Lato-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Lato'; + src: url('../../../static/fonts/lato/Lato-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Lato'; + src: url('../../../static/fonts/lato/Lato-Italic.woff') format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Lato'; + src: url('../../../static/fonts/lato/Lato-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Lato'; + src: url('../../../static/fonts/lato/Lato-Black.woff') format('woff'); + font-weight: 900; + font-style: normal; +} + +/* roboto mono */ + +@font-face { + font-family: 'Roboto Mono'; + src: url('../../../static/fonts/roboto-mono/RobotoMono-Regular.woff') + format('woff'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Roboto Mono'; + src: url('../../../static/fonts/roboto-mono/RobotoMono-Italic.woff') + format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Roboto Mono'; + src: url('../../../static/fonts/roboto-mono/RobotoMono-Bold.woff') + format('woff'); + font-weight: bold; + font-style: normal; +} diff --git a/client/static/fonts/lato/Lato-Black.woff b/client/static/fonts/lato/Lato-Black.woff new file mode 100644 index 0000000000..51a0ce013e Binary files /dev/null and b/client/static/fonts/lato/Lato-Black.woff differ diff --git a/client/static/fonts/lato/Lato-BlackItalic.woff b/client/static/fonts/lato/Lato-BlackItalic.woff new file mode 100644 index 0000000000..53176668d0 Binary files /dev/null and b/client/static/fonts/lato/Lato-BlackItalic.woff differ diff --git a/client/static/fonts/lato/Lato-Bold.woff b/client/static/fonts/lato/Lato-Bold.woff new file mode 100644 index 0000000000..d37d3b3a33 Binary files /dev/null and b/client/static/fonts/lato/Lato-Bold.woff differ diff --git a/client/static/fonts/lato/Lato-BoldItalic.woff b/client/static/fonts/lato/Lato-BoldItalic.woff new file mode 100644 index 0000000000..7f6ea4e3fd Binary files /dev/null and b/client/static/fonts/lato/Lato-BoldItalic.woff differ diff --git a/client/static/fonts/lato/Lato-Hairline.woff b/client/static/fonts/lato/Lato-Hairline.woff new file mode 100644 index 0000000000..876d5a660f Binary files /dev/null and b/client/static/fonts/lato/Lato-Hairline.woff differ diff --git a/client/static/fonts/lato/Lato-HairlineItalic.woff b/client/static/fonts/lato/Lato-HairlineItalic.woff new file mode 100644 index 0000000000..6606fc357a Binary files /dev/null and b/client/static/fonts/lato/Lato-HairlineItalic.woff differ diff --git a/client/static/fonts/lato/Lato-Italic.woff b/client/static/fonts/lato/Lato-Italic.woff new file mode 100644 index 0000000000..c612f2e20b Binary files /dev/null and b/client/static/fonts/lato/Lato-Italic.woff differ diff --git a/client/static/fonts/lato/Lato-Light.woff b/client/static/fonts/lato/Lato-Light.woff new file mode 100644 index 0000000000..3f53baba3a Binary files /dev/null and b/client/static/fonts/lato/Lato-Light.woff differ diff --git a/client/static/fonts/lato/Lato-LightItalic.woff b/client/static/fonts/lato/Lato-LightItalic.woff new file mode 100644 index 0000000000..602971e88b Binary files /dev/null and b/client/static/fonts/lato/Lato-LightItalic.woff differ diff --git a/client/static/fonts/lato/Lato-Regular.woff b/client/static/fonts/lato/Lato-Regular.woff new file mode 100644 index 0000000000..9fb190c516 Binary files /dev/null and b/client/static/fonts/lato/Lato-Regular.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Bold.woff b/client/static/fonts/roboto-mono/RobotoMono-Bold.woff new file mode 100644 index 0000000000..63c1a51d0f Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Bold.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff new file mode 100644 index 0000000000..41d261f9b4 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Italic.woff b/client/static/fonts/roboto-mono/RobotoMono-Italic.woff new file mode 100644 index 0000000000..85e9e18fcf Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Italic.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Light.woff b/client/static/fonts/roboto-mono/RobotoMono-Light.woff new file mode 100644 index 0000000000..98486d1a35 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Light.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff new file mode 100644 index 0000000000..2a7e951bc0 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Medium.woff b/client/static/fonts/roboto-mono/RobotoMono-Medium.woff new file mode 100644 index 0000000000..48bc82ad35 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Medium.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff new file mode 100644 index 0000000000..af5cb552c5 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Regular.woff b/client/static/fonts/roboto-mono/RobotoMono-Regular.woff new file mode 100644 index 0000000000..e17d5ebfa5 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Regular.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Thin.woff b/client/static/fonts/roboto-mono/RobotoMono-Thin.woff new file mode 100644 index 0000000000..6159ff3071 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-Thin.woff differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff new file mode 100644 index 0000000000..d0785d5fe6 Binary files /dev/null and b/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff differ