changed: switch primary font family from Merriweather Sans to Inter

also starting to self hosting font files

package.json

@@ -60,7 +60,9 @@
     "react-tiny-fab": "^3.5.0",
     "react-window": "^1.8.5",
     "regenerator-runtime": "^0.13.2",
-    "reselect": "^4.0.0"
+    "reselect": "^4.0.0",
+    "typeface-inter": "^3.12.0",
+    "typeface-roboto-mono": "^0.0.75"
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",

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);

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;

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">

yarn.lock

@@ -8431,6 +8431,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typeface-inter@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.12.0.tgz#3cd7cdae730daa73cc01e88fdbe27601dc7c4fd7"
+  integrity sha512-3vKBTKCl6S0OJhMKwmyAOodsfTD3Gxsrj5ReavpQmdZ385ecUr3swfNxiBZ4u594mNfojlqL/zUebavV3A1yCA==
+
+typeface-roboto-mono@^0.0.75:
+  version "0.0.75"
+  resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-0.0.75.tgz#00c4543662066a837c014c251ee5140fb66a5ad8"
+  integrity sha512-dYfyXd6HrKyMC/PuBAAtay0tZKsBrzxIW/fBY325vLxFfi/IDKSuyTkWxkU4lyZV6KPHetFnJ661PNXzz2FS/w==
+
 typescript@^3.9.5:
   version "3.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"