Merge pull request #1161 from nummi/inter-font

Inter Font
emberjs · Mar 18, 2020 · 651046b · 651046b
2 parents 1c4f549 + 0a6f0cc
commit 651046b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/app/index.html b/app/index.html
@@ -9,6 +9,24 @@
 
     {{content-for "head"}}
 
+    <style type="text/css">
+      @font-face {
+        font-display: swap;
+        font-family: 'Inter';
+        font-style: normal;
+        font-weight: 400;
+        src: url("{{rootURL}}assets/fonts/Inter-Regular.woff2?v=3.12") format("woff2"), url("{{rootURL}}assets/fonts/Inter-Regular.woff?v=3.12") format("woff");
+      }
+
+      @font-face {
+        font-display: swap;
+        font-family: 'Inter';
+        font-style: normal;
+        font-weight: 700;
+        src: url("{{rootURL}}assets/fonts/Inter-Bold.woff2?v=3.12") format("woff2"), url("{{rootURL}}assets/fonts/Inter-Bold.woff?v=3.12") format("woff");
+      }
+    </style>
+
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-inspector.css">
 

diff --git a/app/styles/base.scss b/app/styles/base.scss
@@ -1,5 +1,5 @@
 :root {
-  --font-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Cantarell', 'Oxygen', 'Ubuntu', 'Helvetica Neue', helvetica, arial, sans-serif;
+  --font-sans-serif: "Inter", -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Cantarell', 'Oxygen', 'Ubuntu', 'Helvetica Neue', helvetica, arial, sans-serif;
   --font-monospace: 'SF Mono', Menlo, Monaco, monospace;
   --inherit: inherit;
   --unit0: 0;

diff --git a/public/assets/fonts/Inter-Bold.woff b/public/assets/fonts/Inter-Bold.woff
diff --git a/public/assets/fonts/Inter-Bold.woff2 b/public/assets/fonts/Inter-Bold.woff2
diff --git a/public/assets/fonts/Inter-Regular.woff b/public/assets/fonts/Inter-Regular.woff
diff --git a/public/assets/fonts/Inter-Regular.woff2 b/public/assets/fonts/Inter-Regular.woff2