Merge pull request #279 from bndkt/dev

Dev
bndkt · Dec 15, 2023 · d38f57b · d38f57b
2 parents b66550c + e134fdc
commit d38f57b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 70 deletions.
diff --git a/.github/workflows/eas-build.yml b/.github/workflows/eas-build.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies

diff --git a/.github/workflows/eas-update.yml b/.github/workflows/eas-update.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies

diff --git a/.github/workflows/seed-data.yml b/.github/workflows/seed-data.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies

diff --git a/.github/workflows/web-preview.yml b/.github/workflows/web-preview.yml
@@ -2,7 +2,7 @@ name: Web Preview
 on:
   push:
     branches:
-      - main
+      - dev
     paths:
       - apps/web/**/*
   pull_request:
@@ -15,7 +15,7 @@ jobs:
       url: ${{ steps.cloudflare-publish.outputs.url }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies

diff --git a/.github/workflows/web-production.yml b/.github/workflows/web-production.yml
@@ -10,7 +10,7 @@ jobs:
       url: ${{ steps.cloudflare-publish.outputs.url }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies

diff --git a/apps/web/app/entry.client.tsx b/apps/web/app/entry.client.tsx
diff --git a/apps/web/app/entry.server.tsx b/apps/web/app/entry.server.tsx
diff --git a/apps/web/app/root.tsx b/apps/web/app/root.tsx
@@ -34,14 +34,18 @@ export const meta: MetaFunction = () => [
 ];
 
 export const links: LinksFunction = () => [
+  { rel: "preconnect", href: "https://fonts.gstatic.com" },
+  {
+    rel: "stylesheet",
+    href: "https://fonts.googleapis.com/css?family=Inter&display=swap",
+  },
   { rel: "stylesheet", href: styles },
   { rel: "apple-touch-icon", sizes: "180x180", href: "/apple-touch-icon.png" },
   {
     rel: "icon",
     type: "image/png",
     href: "/favicon.png",
   },
-  // { rel: "stylesheet", href: "/fonts/inter.woff2" },
 ];
 
 export default function App() {

diff --git a/apps/web/app/tailwind.css b/apps/web/app/tailwind.css
@@ -2,9 +2,14 @@
 @tailwind components;
 @tailwind utilities;
 
-@font-face {
-  font-family: "Inter var";
-  src:
-    local("Inter var"),
-    url("/fonts/inter.woff2") format("woff");
+:root {
+  font-family: Inter, sans-serif;
+  font-feature-settings:
+    "liga" 1,
+    "calt" 1; /* fix for Chrome */
+}
+@supports (font-variation-settings: normal) {
+  :root {
+    font-family: InterVariable, sans-serif;
+  }
 }
diff --git a/apps/web/public/fonts/inter.woff2 b/apps/web/public/fonts/inter.woff2