From 401baa66538860e3dc07d37e0f101d7cd64b5219 Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Sun, 11 Jul 2021 15:08:35 +0100
Subject: [PATCH] fix: noscript message css, remove woff from build

---
 public/index.html   |  8 ++------
 src/index.js        |  7 -------
 src/scss/index.scss | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/public/index.html b/public/index.html
index 5f09844a..f80906d9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,21 +11,17 @@
   <body>
     <noscript>
       <style>
-        @font-face {
-          font-family: 'Lexend Deca';
-          src: url('./static/media/lexend-deca-latin-400-normal.35a9aeba.woff2');
-        }
-
         *, a {
           font-family: 'Lexend Deca', sans-serif;
           text-align: center;
           color: black;
+          background: white !important;
         }
 
         @media (prefers-color-scheme: dark) {
           *, a {
             color: white;
-            background: #2f3640;
+            background: #2f3640 !important;
           }
         }
       </style>
diff --git a/src/index.js b/src/index.js
index 4b99b150..85305036 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,8 +8,6 @@ import './scss/index.scss';
 // the toast css is based on default so we need to import it
 import 'react-toastify/dist/ReactToastify.min.css';
 
-import '@fontsource/lexend-deca/400.css';
-
 // this is opt-in btw, allows you to see your stats etc
 import Stats from './modules/helpers/stats';
 
@@ -25,11 +23,6 @@ if (languagecode === 'en') {
   window.languagecode = 'en_GB';
 }
 
-// only load font if needed
-if (languagecode === 'ru') {
-  require('@fontsource/montserrat/cyrillic-500.css');
-}
-
 // these are merged so if a string is untranslated it doesn't break mue
 window.language = merge(require('./translations/en_GB.json'), require(`./translations/${window.languagecode}.json`));
 
diff --git a/src/scss/index.scss b/src/scss/index.scss
index 9ffc13ab..083533f9 100644
--- a/src/scss/index.scss
+++ b/src/scss/index.scss
@@ -48,3 +48,30 @@ body {
   display: grid;
   color: map-get($theme-colours, 'main-text-color');
 }
+
+// fonts imported from fontsource
+@font-face {
+  font-family: 'Lexend Deca';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-400-normal.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'Lexend Deca';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-ext-400-normal.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('../../node_modules/@fontsource/montserrat/files/montserrat-cyrillic-400-normal.woff2') format('woff2');
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
