Merge pull request #21 from nowrobin/develop

Develop
nowrobin · Jul 12, 2024 · f74b8de · f74b8de
2 parents f739ce2 + 7d01a5b
commit f74b8de
Show file tree

Hide file tree

Showing 14 changed files with 437 additions and 308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,5 +35,3 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 .env
-
-
diff --git a/public/bookmark.png b/public/bookmark.png
diff --git a/public/bookmark.svg b/public/bookmark.svg
diff --git a/public/chev-left.svg b/public/chev-left.svg
diff --git a/public/chev-right.svg b/public/chev-right.svg
diff --git a/public/chevron-left.svg b/public/chevron-left.svg
diff --git a/public/chevron-right.svg b/public/chevron-right.svg
diff --git a/public/share.svg b/public/share.svg
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -15,6 +15,12 @@
     --background-end-rgb: 0, 0, 0;
   }
 }
+/* 
+@font-face {
+  font-family: "SUIT Variable";
+  font-weight: 100 400 900;
+  src: url("/public/font/suit/SUIT-Variable.woff2") format("woff2");
+} */
 
 body {
   color: rgb(var(--foreground-rgb));

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -9,13 +9,37 @@ export const metadata: Metadata = {
   description: "Type quote of the day",
 };
 
+import { Poppins, Hahmlet, Merriweather } from "next/font/google";
+const poppinFont = Poppins({
+  preload: false,
+  weight: ["400"],
+  style: "normal",
+  variable: "--font-poppins",
+});
+const hahmletFont = Hahmlet({
+  preload: false,
+  weight: ["400"],
+  style: "normal",
+  variable: "--font-hahmlet",
+});
+
+const merriweather = Merriweather({
+  preload: false,
+  weight: ["400"],
+  style: "normal",
+  variable: "--font-merriweather",
+});
+
 export default function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en">
+    <html
+      lang="en"
+      className={`${hahmletFont.variable} ${poppinFont.variable} ${merriweather.variable}`}
+    >
       <body className={inter.className}>
         {children}
         <Analytics />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,5 +35,3 @@ yarn-error.log*
		*.tsbuildinfo
		next-env.d.ts
		.env