Merge pull request #178 from BiscuiTech/feature/removed-useless-fonts

cleanup fonts
BiscuiTech · Dec 27, 2023 · de64445 · de64445 · vercel · Dec 27, 2023
2 parents 400a7af + 277c45b
commit de64445
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,6 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@fontsource/fira-mono": "^5.0.8",
 		"@lukeed/uuid": "^2.0.1",
 		"cookie": "^0.5.0",
 		"svelte-i18n": "^4.0.0"

diff --git a/src/app.html b/src/app.html
@@ -5,10 +5,8 @@
 	<meta charset="utf-8" />
 	<link rel="icon" href="/favicon.png" />
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link
-		href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,300;0,400;1,400&family=Open+Sans:wght@300&display=swap"
-		rel="stylesheet" crossOrigin="anonymous" />
-	<link href="/inter.css" rel="stylesheet" />
+	<link rel="preconnect" href="https://rsms.me/">
+	<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
 	%sveltekit.head%
 </head>
 

diff --git a/src/app.postcss b/src/app.postcss
@@ -1,5 +1,3 @@
-@import '@fontsource/fira-mono';
-
 @font-face {
     font-family: 'MonoLisa';
     src: url('/fonts/MonoLisa-Regular.woff2') format('woff2');
@@ -46,7 +44,7 @@
     height: calc(var(--vh, 1vh) * 100);
     scrollbar-width: thin;
     scrollbar-color: var(--thumbBG) var(--scrollbarBG);
-    font-family: "inter" ;
+    font-family: "Inter";
     color: white;
     font-size: max(18px,min(2vw, 24px));
   }
@@ -67,15 +65,15 @@
     box-sizing: border-box;
   }
   h1 {
-    font-family: 'Montserrat', sans-serif;
+    font-family: 'Inter', sans-serif;
     font-weight: 200;
     font-size: 30px;
     font-size: min(max(28px,5vw),54px);
     margin: 0;
     padding: 6px 12px;
   }
   h2 {
-    font-family: 'Montserrat', sans-serif;
+    font-family: 'Inter', sans-serif;
     font-weight: 200;
     font-size: 22px;
     font-size: min(max(20px,3vw),24px);
@@ -150,4 +148,4 @@
   top: 0;
 } */
 
-@tailwind utilities;
+@tailwind utilities;
diff --git a/src/lib/PageHeaders/PageHeader.svelte b/src/lib/PageHeaders/PageHeader.svelte
@@ -4,7 +4,7 @@
 
 <style>
 	h1 {
-		font-family: Montserrat;
+		font-family: Inter;
 		font-size: 36px;
 		font-size: max(36px, min(4vh, 56px));
 		margin: 24px auto 64px auto;

diff --git a/src/lib/PageHeaders/SubHeader.svelte b/src/lib/PageHeaders/SubHeader.svelte
@@ -4,7 +4,7 @@
 
 <style>
 	h2 {
-		font-family: 'Montserrat';
+		font-family: 'Inter';
 		font-size: 24px;
 		font-size: min(max(20px, 2vw), 26px);
 		font-weight: 200;

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -35,7 +35,7 @@
 		text-align: left;
 		margin-bottom: 64px;
 		padding: 0;
-		font-family: 'Montserrat';
+		font-family: 'Inter';
 		font-weight: 200;
 	}
 	.welcome > * {
@@ -44,13 +44,19 @@
 	.welcome--hello {
 		font-size: 28px;
 		font-size: max(30px, min(3vh, 38px));
+
+		container-name: welcome;
 	}
 	.welcome--my-name {
 		font-size: 42px;
-		font-size: max(40px, min(6vh, 72px));
-		font-weight: 800;
+		font-weight: normal;
 		line-height: 100%;
 	}
+	@media (min-width: 880px) {
+		.welcome--my-name {
+			font-size: 64px;
+		}
+	}
 	.welcome--from {
 		font-size: 20px;
 		font-size: max(18px, min(4vh, 24px));
@@ -77,7 +83,7 @@
 		text-decoration: none;
 		color: white;
 		font-weight: 400;
-		font-family: 'Montserrat';
+		font-family: 'Inter';
 		text-transform: lowercase;
 		cursor: pointer;
 

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
@@ -71,14 +71,14 @@
 
 <style>
 	h1 {
-		font-family: Montserrat;
+		font-family: 'Inter';
 		font-size: 36px;
 		font-size: max(36px, min(4vh, 56px));
 		margin: 24px auto 64px auto;
 		text-align: center;
 	}
 	h2 {
-		font-family: 'Montserrat';
+		font-family: 'Inter';
 		font-size: 24px;
 		font-size: min(max(20px, 2vw), 26px);
 		font-weight: 200;

diff --git a/static/inter.css b/static/inter.css
@@ -1,9 +1,10 @@
-@import url("https://rsms.me/inter/inter.css");
-html {
-  font-family: "Inter", sans-serif;
-}
-@supports (font-variation-settings: normal) {
-  html {
-    font-family: "Inter var", sans-serif;
-  }
-}
+: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;
+  }
+}