Merge pull request #39 from rfoel/develop

fix: update font for better mobile support
rfoel · Aug 25, 2020 · ba06bfd · ba06bfd · vercel · Aug 25, 2020
2 parents f19f63b + f972876
commit ba06bfd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/components/Text.js b/components/Text.js
@@ -3,19 +3,8 @@ import styled, { css } from 'styled-components'
 const Text = styled.div(
   () => css`
     display: inline;
-    font-family: 'Programme', sans-serif;
-    -moz-font-feature-settings: 'pnum' on, 'lnum' on, 'ss04' on, 'ss03' on,
-      'ss05' on, 'ss06' on, 'ss07' on, 'ss08' on, 'ss09' on, 'ss10' on,
-      'ss11' on, 'ss12' on, 'ss13' on, 'ss20' on, 'ss14' on, 'ss15' on,
-      'ss18' on, 'ss19' on;
-    -webkit-font-feature-settings: 'pnum' on, 'lnum' on, 'ss04' on, 'ss03' on,
-      'ss05' on, 'ss06' on, 'ss07' on, 'ss08' on, 'ss09' on, 'ss10' on,
-      'ss11' on, 'ss12' on, 'ss13' on, 'ss20' on, 'ss14' on, 'ss15' on,
-      'ss18' on, 'ss19' on;
-    font-feature-settings: 'pnum' on, 'lnum' on, 'ss04' on, 'ss03' on, 'ss05' on,
-      'ss06' on, 'ss07' on, 'ss08' on, 'ss09' on, 'ss10' on, 'ss11' on,
-      'ss12' on, 'ss13' on, 'ss20' on, 'ss14' on, 'ss15' on, 'ss18' on,
-      'ss19' on;
+    font-family: 'TT Firs Neue', -apple-system, system-ui, 'Segoe UI', Roboto,
+      Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
   `,
 )
 

diff --git a/public/TTFirsNeue-DemiBold.eot b/public/TTFirsNeue-DemiBold.eot
diff --git a/public/TTFirsNeue-DemiBold.ttf b/public/TTFirsNeue-DemiBold.ttf
diff --git a/public/TTFirsNeue-DemiBold.woff b/public/TTFirsNeue-DemiBold.woff
diff --git a/public/TTFirsNeue-DemiBold.woff2 b/public/TTFirsNeue-DemiBold.woff2
diff --git a/public/programme.woff2 b/public/programme.woff2
diff --git a/styles/index.css b/styles/index.css
@@ -1,17 +1,21 @@
 @font-face {
-  font-family: 'Programme', sans-serif;
+  font-display: swap;
+  font-family: 'TT Firs Neue';
   font-style: normal;
-  font-weight: normal;
-  src: url('/public/programme.woff2') format('woff2');
+  font-weight: 600;
+  src: url('/public/TTFirsNeue-DemiBold.eot');
+  src: url('/public/TTFirsNeue-DemiBold.eot?#iefix') format('embedded-opentype'),
+    url('/public/TTFirsNeue-DemiBold.woff2') format('woff2'),
+    url('/public/TTFirsNeue-DemiBold.woff') format('woff'),
+    url('/public/TTFirsNeue-DemiBold.svg#TTFirsNeue-DemiBold') format('svg');
 }
 
 html,
 body,
 #__next {
   display: flex;
-  font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto, Oxygen,
-    Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Helvetica,
-    Arial, sans-serif;
+  font-family: -apple-system, system-ui, 'Segoe UI', Roboto, Oxygen, Ubuntu,
+    Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
   flex-direction: column;
   flex-grow: 1;
   margin: 0;