Merge pull request #13 from jorbush/font

Setting up custom font
jorbush · Sep 25, 2024 · 6c5d6ad · 6c5d6ad
2 parents 5c03d78 + 390e423
commit 6c5d6ad
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 2 deletions.
diff --git a/postrify-frontend/public/fonts/quicksand/Quicksand-Bold.ttf b/postrify-frontend/public/fonts/quicksand/Quicksand-Bold.ttf
diff --git a/postrify-frontend/public/fonts/quicksand/Quicksand-Light.ttf b/postrify-frontend/public/fonts/quicksand/Quicksand-Light.ttf
diff --git a/postrify-frontend/public/fonts/quicksand/Quicksand-Medium.ttf b/postrify-frontend/public/fonts/quicksand/Quicksand-Medium.ttf
diff --git a/postrify-frontend/public/fonts/quicksand/Quicksand-Regular.ttf b/postrify-frontend/public/fonts/quicksand/Quicksand-Regular.ttf
diff --git a/postrify-frontend/public/fonts/quicksand/Quicksand-SemiBold.ttf b/postrify-frontend/public/fonts/quicksand/Quicksand-SemiBold.ttf
diff --git a/postrify-frontend/src/app/header/header.component.ts b/postrify-frontend/src/app/header/header.component.ts
@@ -178,7 +178,7 @@ import { AuthService } from '../services/auth.service';
         .toggle-button:hover,
         .logout-button:hover {
           background-color: initial;
-          color: initial;
+          color: var(--header-text);
         }
       }
 

diff --git a/postrify-frontend/src/app/login/login.component.ts b/postrify-frontend/src/app/login/login.component.ts
@@ -106,6 +106,7 @@ import { Router } from '@angular/router';
         background-color: var(--input-bg);
         font-size: 16px;
         color: var(--text-color);
+        font-family: 'Quicksand', sans-serif;
       }
 
       button {
@@ -118,6 +119,7 @@ import { Router } from '@angular/router';
         cursor: pointer;
         transition: background-color 0.3s ease;
         font-size: 16px;
+        font-family: 'Quicksand', sans-serif;
       }
 
       button:hover {

diff --git a/postrify-frontend/src/app/register/register.component.ts b/postrify-frontend/src/app/register/register.component.ts
@@ -129,6 +129,7 @@ import { ToastService } from '../services/toast.service';
         background-color: var(--input-bg);
         font-size: 16px;
         color: var(--text-color);
+        font-family: 'Quicksand', sans-serif;
       }
 
       button {
@@ -141,6 +142,7 @@ import { ToastService } from '../services/toast.service';
         cursor: pointer;
         transition: background-color 0.3s ease;
         font-size: 16px;
+        font-family: 'Quicksand', sans-serif;
       }
 
       button:hover {

diff --git a/postrify-frontend/src/styles.css b/postrify-frontend/src/styles.css
@@ -13,8 +13,44 @@
   --text-color: #333333;
 }
 
+@font-face {
+  font-family: 'Quicksand';
+  src: url('/fonts/quicksand/Quicksand-Regular.ttf') format('truetype');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Quicksand';
+  src: url('/fonts/quicksand/Quicksand-Bold.ttf') format('truetype');
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Quicksand';
+  src: url('/fonts/quicksand/Quicksand-Light.ttf') format('truetype');
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Quicksand';
+  src: url('/fonts/quicksand/Quicksand-Medium.ttf') format('truetype');
+  font-weight: 500;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Quicksand';
+  src: url('/assets/fonts/quicksand/Quicksand-SemiBold.ttf') format('truetype');
+  font-weight: 600;
+  font-style: normal;
+}
+
+
 body {
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-family: 'Quicksand', sans-serif;
   margin: 0;
   background-color: var(--body-bg);
   color: var(--body-text);