From b4941d8556492375ce3ce96292e00d4e21c73e5e Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Mon, 30 Sep 2024 16:04:19 -0500
Subject: Use Inter variable font (#5540)

---
 app.config.js                                      |  20 +----
 assets/fonts/inter/InterVariable-Italic.ttf        | Bin 0 -> 894460 bytes
 assets/fonts/inter/InterVariable.ttf               | Bin 0 -> 862936 bytes
 .../media/Inter-Black.66e9a87f1c921e844ed4.otf     | Bin 619772 -> 0 bytes
 .../Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf     | Bin 592516 -> 0 bytes
 .../media/Inter-Bold.8d330503e1d034ad68de.otf      | Bin 626056 -> 0 bytes
 .../Inter-BoldItalic.bb17e63f9baa0d861a20.otf      | Bin 604316 -> 0 bytes
 .../media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf | Bin 627736 -> 0 bytes
 .../Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf | Bin 603412 -> 0 bytes
 .../media/Inter-Italic.95778eb0c75dc956257e.otf    | Bin 586752 -> 0 bytes
 .../media/Inter-Medium.296aa2d65964269836b3.otf    | Bin 622088 -> 0 bytes
 .../Inter-MediumItalic.0e57e17a6311368e2114.otf    | Bin 599652 -> 0 bytes
 .../media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf   | Bin 605092 -> 0 bytes
 .../media/Inter-SemiBold.2277990330981b8409bb.otf  | Bin 624244 -> 0 bytes
 .../Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf  | Bin 602496 -> 0 bytes
 .../InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf  | Bin 0 -> 894460 bytes
 .../media/InterVariable.c9f788f6e7ebaec75d7c.ttf   | Bin 0 -> 862936 bytes
 bskyweb/templates/base.html                        |  22 +----
 src/alf/fonts.ts                                   |  25 +-----
 src/style.css                                      |  96 ++-------------------
 web/index.html                                     |  22 +----
 21 files changed, 18 insertions(+), 167 deletions(-)
 create mode 100644 assets/fonts/inter/InterVariable-Italic.ttf
 create mode 100644 assets/fonts/inter/InterVariable.ttf
 delete mode 100644 bskyweb/static/media/Inter-Black.66e9a87f1c921e844ed4.otf
 delete mode 100644 bskyweb/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf
 delete mode 100644 bskyweb/static/media/Inter-Bold.8d330503e1d034ad68de.otf
 delete mode 100644 bskyweb/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf
 delete mode 100644 bskyweb/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf
 delete mode 100644 bskyweb/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf
 delete mode 100644 bskyweb/static/media/Inter-Italic.95778eb0c75dc956257e.otf
 delete mode 100644 bskyweb/static/media/Inter-Medium.296aa2d65964269836b3.otf
 delete mode 100644 bskyweb/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf
 delete mode 100644 bskyweb/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf
 delete mode 100644 bskyweb/static/media/Inter-SemiBold.2277990330981b8409bb.otf
 delete mode 100644 bskyweb/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf
 create mode 100644 bskyweb/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf
 create mode 100644 bskyweb/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf

diff --git a/app.config.js b/app.config.js
index fe65c4fde..6b2bad938 100644
--- a/app.config.js
+++ b/app.config.js
@@ -234,24 +234,8 @@ module.exports = function (config) {
           'expo-font',
           {
             fonts: [
-              // './assets/fonts/inter/Inter-Thin.otf',
-              // './assets/fonts/inter/Inter-ThinItalic.otf',
-              // './assets/fonts/inter/Inter-ExtraLight.otf',
-              // './assets/fonts/inter/Inter-ExtraLightItalic.otf',
-              // './assets/fonts/inter/Inter-Light.otf',
-              // './assets/fonts/inter/Inter-LightItalic.otf',
-              './assets/fonts/inter/Inter-Regular.otf',
-              './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
-              './assets/fonts/inter/Inter-SemiBold.otf',
-              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
-              './assets/fonts/inter/Inter-ExtraBold.otf',
-              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
-              './assets/fonts/inter/Inter-Black.otf',
-              './assets/fonts/inter/Inter-BlackItalic.otf',
+              './assets/fonts/inter/InterVariable.ttf',
+              './assets/fonts/inter/InterVariable-Italic.ttf',
             ],
           },
         ],
diff --git a/assets/fonts/inter/InterVariable-Italic.ttf b/assets/fonts/inter/InterVariable-Italic.ttf
new file mode 100644
index 000000000..ed674e77c
Binary files /dev/null and b/assets/fonts/inter/InterVariable-Italic.ttf differ
diff --git a/assets/fonts/inter/InterVariable.ttf b/assets/fonts/inter/InterVariable.ttf
new file mode 100644
index 000000000..2d4b47093
Binary files /dev/null and b/assets/fonts/inter/InterVariable.ttf differ
diff --git a/bskyweb/static/media/Inter-Black.66e9a87f1c921e844ed4.otf b/bskyweb/static/media/Inter-Black.66e9a87f1c921e844ed4.otf
deleted file mode 100644
index 44d1779af..000000000
Binary files a/bskyweb/static/media/Inter-Black.66e9a87f1c921e844ed4.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf b/bskyweb/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf
deleted file mode 100644
index 6fc475e41..000000000
Binary files a/bskyweb/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-Bold.8d330503e1d034ad68de.otf b/bskyweb/static/media/Inter-Bold.8d330503e1d034ad68de.otf
deleted file mode 100644
index 58a38073e..000000000
Binary files a/bskyweb/static/media/Inter-Bold.8d330503e1d034ad68de.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf b/bskyweb/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf
deleted file mode 100644
index e67935aa5..000000000
Binary files a/bskyweb/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf b/bskyweb/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf
deleted file mode 100644
index 66cd95228..000000000
Binary files a/bskyweb/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf b/bskyweb/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf
deleted file mode 100644
index f269814a6..000000000
Binary files a/bskyweb/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-Italic.95778eb0c75dc956257e.otf b/bskyweb/static/media/Inter-Italic.95778eb0c75dc956257e.otf
deleted file mode 100644
index f78848b98..000000000
Binary files a/bskyweb/static/media/Inter-Italic.95778eb0c75dc956257e.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-Medium.296aa2d65964269836b3.otf b/bskyweb/static/media/Inter-Medium.296aa2d65964269836b3.otf
deleted file mode 100644
index f44f89ada..000000000
Binary files a/bskyweb/static/media/Inter-Medium.296aa2d65964269836b3.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf b/bskyweb/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf
deleted file mode 100644
index 1970f5721..000000000
Binary files a/bskyweb/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf b/bskyweb/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf
deleted file mode 100644
index 2d0bd1d64..000000000
Binary files a/bskyweb/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-SemiBold.2277990330981b8409bb.otf b/bskyweb/static/media/Inter-SemiBold.2277990330981b8409bb.otf
deleted file mode 100644
index 52c84550b..000000000
Binary files a/bskyweb/static/media/Inter-SemiBold.2277990330981b8409bb.otf and /dev/null differ
diff --git a/bskyweb/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf b/bskyweb/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf
deleted file mode 100644
index b725bfc88..000000000
Binary files a/bskyweb/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf and /dev/null differ
diff --git a/bskyweb/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf b/bskyweb/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf
new file mode 100644
index 000000000..ed674e77c
Binary files /dev/null and b/bskyweb/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf differ
diff --git a/bskyweb/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf b/bskyweb/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf
new file mode 100644
index 000000000..2d4b47093
Binary files /dev/null and b/bskyweb/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf differ
diff --git a/bskyweb/templates/base.html b/bskyweb/templates/base.html
index 03686ef5c..885d13d2a 100644
--- a/bskyweb/templates/base.html
+++ b/bskyweb/templates/base.html
@@ -13,24 +13,8 @@
 
   <!-- Hello Humans! API docs at https://atproto.com -->
 
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Italic.95778eb0c75dc956257e.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Medium.296aa2d65964269836b3.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf">
-  -->
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBold.2277990330981b8409bb.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Bold.8d330503e1d034ad68de.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf">
-  -->
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Black.66e9a87f1c921e844ed4.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf">
-  -->
+  <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf">
+  <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf">
 
   <style>
     /**
@@ -53,7 +37,7 @@
     body {
       margin: 0px;
       padding: 0px;
-      font-family: 'Inter-Regular', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif;
+      font-family: InterVariable, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif;
       text-rendering: optimizeLegibility;
       /* Platform-specific reset */
       -webkit-overflow-scrolling: touch;
diff --git a/src/alf/fonts.ts b/src/alf/fonts.ts
index 46c741bc7..ae2aaa97a 100644
--- a/src/alf/fonts.ts
+++ b/src/alf/fonts.ts
@@ -40,31 +40,10 @@ export function applyFonts(
   fontFamily: 'system' | 'theme',
 ) {
   if (fontFamily === 'theme') {
-    style.fontFamily =
-      {
-        // '100': 'Inter-Thin',
-        // '200': 'Inter-ExtraLight',
-        // '300': 'Inter-Light',
-        // '500': 'Inter-Medium',
-        // '700': 'Inter-Bold',
-        // '900': 'Inter-Black',
-        '100': 'Inter-Regular',
-        '200': 'Inter-Regular',
-        '300': 'Inter-Regular',
-        '400': 'Inter-Regular',
-        '500': 'Inter-SemiBold',
-        '600': 'Inter-SemiBold',
-        '700': 'Inter-SemiBold',
-        '800': 'Inter-ExtraBold',
-        '900': 'Inter-ExtraBold',
-      }[style.fontWeight as string] || 'Inter-Regular'
+    style.fontFamily = 'InterVariable'
 
     if (style.fontStyle === 'italic') {
-      if (style.fontFamily === 'Inter-Regular') {
-        style.fontFamily = 'Inter-Italic'
-      } else {
-        style.fontFamily += 'Italic'
-      }
+      style.fontFamily += 'Italic'
     }
 
     // fallback families only supported on web
diff --git a/src/style.css b/src/style.css
index b0b01ba3e..9451e4f56 100644
--- a/src/style.css
+++ b/src/style.css
@@ -7,101 +7,21 @@
  */
 
 @font-face {
-  font-family: 'Inter-Regular';
-  src: local('Inter-Regular'),
-    url(/assets/fonts/inter/Inter-Regular.otf) format('opentype');
-  font-weight: 400;
+  font-family: 'InterVariable';
+  src: local('InterVariable'),
+    url(/assets/fonts/inter/InterVariable.ttf) format('truetype');
+  font-weight: 300 1000;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
-  font-family: 'Inter-Italic';
-  src: local('Inter-Italic'),
-    url(/assets/fonts/inter/Inter-Italic.otf) format('opentype');
-  font-weight: 400;
+  font-family: 'InterVariableItalic';
+  src: local('InterVariableItalic'),
+    url(/assets/fonts/inter/InterVariable-Italic.ttf) format('truetype');
+  font-weight: 300 1000;
   font-style: italic;
   font-display: swap;
 }
-/*
-@font-face {
-  font-family: "Inter-Medium";
-  src: local("Inter-Medium"), url(/assets/fonts/inter/Inter-Medium.otf) format("opentype");
-  font-weight: 500;
-  font-style: normal;
-  font-display: swap;
-}
-@font-face {
-  font-family: "Inter-MediumItalic";
-  src: local("Inter-MediumItalic"), url(/assets/fonts/inter/Inter-MediumItalic.otf) format("opentype");
-  font-weight: 500;
-  font-style: italic;
-  font-display: swap;
-}
-*/
-@font-face {
-  font-family: 'Inter-SemiBold';
-  src: local('Inter-SemiBold'),
-    url(/assets/fonts/inter/Inter-SemiBold.otf) format('opentype');
-  font-weight: 600;
-  font-style: normal;
-  font-display: swap;
-}
-@font-face {
-  font-family: 'Inter-SemiBoldItalic';
-  src: local('Inter-SemiBoldItalic'),
-    url(/assets/fonts/inter/Inter-SemiBoldItalic.otf) format('opentype');
-  font-weight: 600;
-  font-style: italic;
-  font-display: swap;
-}
-/*
-@font-face {
-  font-family: "Inter-Bold";
-  src: local("Inter-Bold"), url(/assets/fonts/inter/Inter-Bold.otf) format("opentype");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}
-@font-face {
-  font-family: "Inter-BoldItalic";
-  src: local("Inter-BoldItalic"), url(/assets/fonts/inter/Inter-BoldItalic.otf) format("opentype");
-  font-weight: 700;
-  font-style: italic;
-  font-display: swap;
-}
-*/
-@font-face {
-  font-family: 'Inter-ExtraBold';
-  src: local('Inter-ExtraBold'),
-    url(/assets/fonts/inter/Inter-ExtraBold.otf) format('opentype');
-  font-weight: 800;
-  font-style: normal;
-  font-display: swap;
-}
-@font-face {
-  font-family: 'Inter-ExtraBoldItalic';
-  src: local('Inter-ExtraBoldItalic'),
-    url(/assets/fonts/inter/Inter-ExtraBoldItalic.otf) format('opentype');
-  font-weight: 800;
-  font-style: italic;
-  font-display: swap;
-}
-/*
-@font-face {
-  font-family: "Inter-Black";
-  src: local("Inter-Black"), url(/assets/fonts/inter/Inter-Black.otf) format("opentype");
-  font-weight: 900;
-  font-style: normal;
-  font-display: swap;
-}
-@font-face {
-  font-family: "Inter-BlackItalic";
-  src: local("Inter-BlackItalic"), url(/assets/fonts/inter/Inter-BlackItalic.otf) format("opentype");
-  font-weight: 900;
-  font-style: italic;
-  font-display: swap;
-}
-*/
 
 /**
  * BEGIN STYLES
diff --git a/web/index.html b/web/index.html
index 71e5ac089..8efc2cb68 100644
--- a/web/index.html
+++ b/web/index.html
@@ -18,24 +18,8 @@
     <link rel="preconnect" href="https://bsky.network">
     <title>%WEB_TITLE%</title>
 
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Italic.95778eb0c75dc956257e.otf">
-    <!--
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Medium.296aa2d65964269836b3.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf">
-    -->
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBold.2277990330981b8409bb.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf">
-    <!--
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Bold.8d330503e1d034ad68de.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf">
-    -->
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf">
-    <!--
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Black.66e9a87f1c921e844ed4.otf">
-    <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf">
-    -->
+    <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf">
+    <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf">
 
     <style>
       /**
@@ -58,7 +42,7 @@
       body {
         margin: 0px;
         padding: 0px;
-        font-family: 'Inter-Regular', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif;
+        font-family: InterVariable, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif;
         text-rendering: optimizeLegibility;
         /* Platform-specific reset */
         -webkit-overflow-scrolling: touch;
-- 
cgit 1.4.1