Merge pull request #86 from xy-planning-network/spk/typography

update font loading
xy-planning-network · Aug 28, 2024 · c4e0e0c · c4e0e0c
2 parents 33a6b07 + c3d83ec
commit c4e0e0c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/ranger/tmpl/error.tmpl b/ranger/tmpl/error.tmpl
@@ -7,10 +7,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" sizes="48x48" href="{{ asset "favicon.ico" }}" />
     <link rel="icon" sizes="any" type="image/svg+xml" href="data:image/svg+xml,%3Csvg%20version%3D%221.1%22%20viewBox%3D%220%200%20280%20280%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cpath%20fill%3D%22%23b7dd79%22%20d%3D%22m17.57%2C94.37c-3.36%2C13.54-5.07%2C28.73-5.07%2C45.63%2C0%2C32.02%2C6.04%2C58%2C18.1%2C77.95%2C3.81%2C4.98%2C7.46%2C9.94%2C10.95%2C14.66%2C21.21%2C23.24%2C54.01%2C34.89%2C98.45%2C34.89.71%2C0%2C1.39-.03%2C2.09-.03-3.62-46.93-22.27-88.31-54.36-124.11-19.79-22.07-42.96-38.86-70.16-48.99Z%22%20%2F%3E%20%3Cpath%20fill%3D%22%232850be%22%20d%3D%22m267.5%2C140c0-85-42.5-127.5-127.5-127.5-55.06%2C0-92.27%2C17.86-111.66%2C53.53%2C28.32%2C8.48%2C56.67%2C16.85%2C84.98%2C25.37%2C27.05%2C8.14%2C54.01%2C16.55%2C81.06%2C24.67%2C5.45%2C1.64%2C7.5%2C4.76%2C6.63%2C10.27-.69%2C4.35-1.04%2C8.75-1.57%2C13.13-4.95%2C40.77-8.32%2C81.74-12.43%2C122.61%2C53.64-13.88%2C80.49-54.56%2C80.49-122.08Z%22%20%2F%3E%20%3C%2Fsvg%3E">
-    <link href="https://rsms.me/inter/inter.css" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Work+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet" />
 <style>
   :root {
-    font-family: "Inter var", sans-serif;
+    font-family: "Open Sans", sans-serif;
   }
   footer {
     bottom: 0px;

diff --git a/ranger/tmpl/layout/authenticated_base.tmpl b/ranger/tmpl/layout/authenticated_base.tmpl
@@ -9,7 +9,9 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" sizes="48x48" href="{{ asset "favicon.ico" }}" />
     <link rel="icon" sizes="any" type="image/svg+xml" href="data:image/svg+xml,%3Csvg%20version%3D%221.1%22%20viewBox%3D%220%200%20280%20280%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cpath%20fill%3D%22%23b7dd79%22%20d%3D%22m17.57%2C94.37c-3.36%2C13.54-5.07%2C28.73-5.07%2C45.63%2C0%2C32.02%2C6.04%2C58%2C18.1%2C77.95%2C3.81%2C4.98%2C7.46%2C9.94%2C10.95%2C14.66%2C21.21%2C23.24%2C54.01%2C34.89%2C98.45%2C34.89.71%2C0%2C1.39-.03%2C2.09-.03-3.62-46.93-22.27-88.31-54.36-124.11-19.79-22.07-42.96-38.86-70.16-48.99Z%22%20%2F%3E%20%3Cpath%20fill%3D%22%232850be%22%20d%3D%22m267.5%2C140c0-85-42.5-127.5-127.5-127.5-55.06%2C0-92.27%2C17.86-111.66%2C53.53%2C28.32%2C8.48%2C56.67%2C16.85%2C84.98%2C25.37%2C27.05%2C8.14%2C54.01%2C16.55%2C81.06%2C24.67%2C5.45%2C1.64%2C7.5%2C4.76%2C6.63%2C10.27-.69%2C4.35-1.04%2C8.75-1.57%2C13.13-4.95%2C40.77-8.32%2C81.74-12.43%2C122.61%2C53.64-13.88%2C80.49-54.56%2C80.49-122.08Z%22%20%2F%3E%20%3C%2Fsvg%3E">
-    <link href="https://rsms.me/inter/inter.css" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Work+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet" />
 
     {{ template "additionalHeadScripts" }}
 

diff --git a/ranger/tmpl/layout/unauthenticated_base.tmpl b/ranger/tmpl/layout/unauthenticated_base.tmpl
@@ -9,7 +9,9 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" sizes="48x48" href="{{ asset "favicon.ico" }}" />
     <link rel="icon" sizes="any" type="image/svg+xml" href="data:image/svg+xml,%3Csvg%20version%3D%221.1%22%20viewBox%3D%220%200%20280%20280%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cpath%20fill%3D%22%23b7dd79%22%20d%3D%22m17.57%2C94.37c-3.36%2C13.54-5.07%2C28.73-5.07%2C45.63%2C0%2C32.02%2C6.04%2C58%2C18.1%2C77.95%2C3.81%2C4.98%2C7.46%2C9.94%2C10.95%2C14.66%2C21.21%2C23.24%2C54.01%2C34.89%2C98.45%2C34.89.71%2C0%2C1.39-.03%2C2.09-.03-3.62-46.93-22.27-88.31-54.36-124.11-19.79-22.07-42.96-38.86-70.16-48.99Z%22%20%2F%3E%20%3Cpath%20fill%3D%22%232850be%22%20d%3D%22m267.5%2C140c0-85-42.5-127.5-127.5-127.5-55.06%2C0-92.27%2C17.86-111.66%2C53.53%2C28.32%2C8.48%2C56.67%2C16.85%2C84.98%2C25.37%2C27.05%2C8.14%2C54.01%2C16.55%2C81.06%2C24.67%2C5.45%2C1.64%2C7.5%2C4.76%2C6.63%2C10.27-.69%2C4.35-1.04%2C8.75-1.57%2C13.13-4.95%2C40.77-8.32%2C81.74-12.43%2C122.61%2C53.64-13.88%2C80.49-54.56%2C80.49-122.08Z%22%20%2F%3E%20%3C%2Fsvg%3E">
-    <link href="https://rsms.me/inter/inter.css" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Work+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet" />
 
     {{ template "additionalHeadScripts" }}
 

diff --git a/ranger/tmpl/maintenance.tmpl b/ranger/tmpl/maintenance.tmpl
@@ -7,10 +7,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" sizes="48x48" href="{{ asset "favicon.ico" }}" />
     <link rel="icon" sizes="any" type="image/svg+xml" href="data:image/svg+xml,%3Csvg%20version%3D%221.1%22%20viewBox%3D%220%200%20280%20280%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cpath%20fill%3D%22%23b7dd79%22%20d%3D%22m17.57%2C94.37c-3.36%2C13.54-5.07%2C28.73-5.07%2C45.63%2C0%2C32.02%2C6.04%2C58%2C18.1%2C77.95%2C3.81%2C4.98%2C7.46%2C9.94%2C10.95%2C14.66%2C21.21%2C23.24%2C54.01%2C34.89%2C98.45%2C34.89.71%2C0%2C1.39-.03%2C2.09-.03-3.62-46.93-22.27-88.31-54.36-124.11-19.79-22.07-42.96-38.86-70.16-48.99Z%22%20%2F%3E%20%3Cpath%20fill%3D%22%232850be%22%20d%3D%22m267.5%2C140c0-85-42.5-127.5-127.5-127.5-55.06%2C0-92.27%2C17.86-111.66%2C53.53%2C28.32%2C8.48%2C56.67%2C16.85%2C84.98%2C25.37%2C27.05%2C8.14%2C54.01%2C16.55%2C81.06%2C24.67%2C5.45%2C1.64%2C7.5%2C4.76%2C6.63%2C10.27-.69%2C4.35-1.04%2C8.75-1.57%2C13.13-4.95%2C40.77-8.32%2C81.74-12.43%2C122.61%2C53.64-13.88%2C80.49-54.56%2C80.49-122.08Z%22%20%2F%3E%20%3C%2Fsvg%3E">
-    <link href="https://rsms.me/inter/inter.css" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Work+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet" />
 <style>
   :root {
-    font-family: "Inter var", sans-serif;
+    font-family: "Open Sans", sans-serif;
   }
   footer {
     bottom: 0px;