Update font

muuvmuuv · Feb 3, 2020 · acf0feb · acf0feb
1 parent a6f21ba
commit acf0feb
Show file tree

Hide file tree

Showing 43 changed files with 16 additions and 8 deletions.
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Bold-Italic.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Bold.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Bold.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Bold.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Bold.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.woff b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-ExtraBold.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Italic.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Italic.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Italic.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Italic.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Italic.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Italic.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Medium-Italic.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Medium.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Medium.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Medium.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Medium.woff2
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Regular.ttf b/src/fonts/JetBrainsMono/JetBrainsMono-Regular.ttf
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Regular.woff b/src/fonts/JetBrainsMono/JetBrainsMono-Regular.woff
diff --git a/src/fonts/JetBrainsMono/JetBrainsMono-Regular.woff2 b/src/fonts/JetBrainsMono/JetBrainsMono-Regular.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Black.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-Black.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Black.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-Black.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-BlackItalic.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-BlackItalic.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-BlackItalic.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-BlackItalic.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Bold.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-Bold.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Bold.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-Bold.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-BoldItalic.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-BoldItalic.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-BoldItalic.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-BoldItalic.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Italic.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-Italic.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Italic.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-Italic.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Regular.woff b/src/fonts/PlayfairDisplay/PlayfairDisplay-Regular.woff
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay-Regular.woff2 b/src/fonts/PlayfairDisplay/PlayfairDisplay-Regular.woff2
diff --git a/src/fonts/PlayfairDisplay/PlayfairDisplay.ttf b/src/fonts/PlayfairDisplay/PlayfairDisplay.ttf
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
@@ -3,9 +3,9 @@
     'Noto Color Emoji';
   --font-sans: 'Inter', -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Roboto, Arial,
     'Segoe UI', 'Noto Sans', sans-serif, var(--font-emoji);
-  --font-serif: 'Playfair Display', -webkit-pictograph, serif, var(--font-emoji);
-  --font-mono: 'JetBrains Mono', 'mononoki', Menlo, Monaco, Consolas, 'Liberation Mono',
-    'Courier New', monospace, var(--font-emoji);
+  --font-serif: 'Playfair Display', serif, var(--font-emoji);
+  --font-mono: 'JetBrains Mono', 'IBM Plex Mono', 'mononoki', Menlo, Monaco, Consolas,
+    'Liberation Mono', 'Courier New', monospace, var(--font-emoji);
 
   --font-extra-light: 100;
   --font-light: 200;

diff --git a/src/styles/fonts/_inter.scss b/src/styles/fonts/_inter.scss
@@ -3,6 +3,8 @@ $font-slug: 'Inter';
 $font-path: '../fonts/#{$font-slug}';
 $font-display: swap;
 
+// https://github.com/rsms/inter/
+
 @font-face {
   font-family: $font-name;
   font-style: normal;

diff --git a/src/styles/fonts/_jetbrains-mono.scss b/src/styles/fonts/_jetbrains-mono.scss
@@ -3,11 +3,14 @@ $font-slug: 'JetBrainsMono';
 $font-path: '../fonts/#{$font-slug}';
 $font-display: fallback;
 
+// https://www.jetbrains.com/lp/mono/#intro
+
 @font-face {
   font-family: $font-name;
   font-style: normal;
   font-weight: 400;
   font-display: $font-display;
   src: local($font-name), local($font-slug),
-    url('#{$font-path}/#{$font-slug}-Regular.ttf') format('ttf');
+    url('#{$font-path}/#{$font-slug}-Regular.woff2') format('woff2'),
+    url('#{$font-path}/#{$font-slug}-Regular.woff') format('woff');
 }
diff --git a/src/styles/fonts/_playfair-display.scss b/src/styles/fonts/_playfair-display.scss
@@ -3,11 +3,14 @@ $font-slug: 'PlayfairDisplay';
 $font-path: '../fonts/#{$font-slug}';
 $font-display: fallback;
 
+// https://github.com/clauseggers/Playfair-Display
+
 @font-face {
   font-family: $font-name;
   font-style: normal;
   font-weight: 400;
   font-display: $font-display;
   src: local($font-name), local($font-slug),
-    url('#{$font-path}/#{$font-slug}.ttf') format('ttf');
+    url('#{$font-path}/#{$font-slug}-Regular.woff2') format('woff2'),
+    url('#{$font-path}/#{$font-slug}-Regular.woff') format('woff');
 }
diff --git a/src/styles/layouts/_nav.scss b/src/styles/layouts/_nav.scss
@@ -32,7 +32,6 @@
   }
 
   nav {
-    font-family: var(--font-mono);
     font-size: var(--text-sm);
     font-weight: var(--font-bold);
     letter-spacing: 1px;
@@ -68,6 +67,7 @@
     z-index: 22;
     width: 40px;
     height: 40px;
+    margin: -6px; // remove flickering
     border: 0;
     background: transparent;
     cursor: pointer;

diff --git a/src/styles/pages/_writings.scss b/src/styles/pages/_writings.scss
@@ -27,10 +27,10 @@
 
     h2 {
       font-family: var(--font-serif);
-      font-size: var(--text-lg);
+      font-size: var(--text-xl);
 
       @include breakpoint-up(lg) {
-        font-size: var(--text-xl);
+        font-size: var(--text-xxl);
       }
     }