changed: switch primary font family from Merriweather Sans to Inter

also starting to self hosting font files

3 files changed, 7 insertions, 3 deletions

diff --git a/src/app.js b/src/app.js
index 9209960..9d1f216 100644
--- a/src/app.js
+++ b/src/app.js
@@ -5,6 +5,11 @@ import ReactDOM from 'react-dom';
 import Modal from 'react-modal';
 import Root from './components/Root';
 
+// eslint-disable-next-line no-unused-expressions
+import('typeface-inter');
+// eslint-disable-next-line no-unused-expressions
+import('typeface-roboto-mono');
+
 const rootEl = document.getElementById('app');
 
 Modal.setAppElement(rootEl);
diff --git a/src/components/Root.css b/src/components/Root.css
index 22cae24..895ce14 100644
--- a/src/components/Root.css
+++ b/src/components/Root.css
@@ -63,8 +63,8 @@
 }
 
 body {
-  font-family: 'Merriweather Sans', -apple-system, BlinkMacSystemFont, Segoe UI,
-    Roboto, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+    Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
     Segoe UI Symbol, 'PingFang SC', 'Microsoft YaHei', '微软雅黑', Arial,
     sans-serif;
   margin: 0;
diff --git a/src/index.template.ejs b/src/index.template.ejs
index 9714a03..1f41e36 100644
--- a/src/index.template.ejs
+++ b/src/index.template.ejs
@@ -11,7 +11,6 @@
   <meta name="description" content="Yet Another Clash Dashboard">
   <meta name="theme-color" content="#202020">
   <title><%= htmlWebpackPlugin.options.title %></title>
-  <link href="https://fonts.googleapis.com/css2?family=Merriweather+Sans:wght@400;700&family=Roboto+Mono&display=swap" rel="stylesheet">
   <meta property="og:image" content="https://user-images.githubusercontent.com/1166872/47304841-536f3d80-d65a-11e8-8908-1917127dafc5.png">
   <meta property="og:site_name" content="yacd">
   <meta property="og:type" content="object">