diff --git a/app/globals.css b/app/globals.css index c4870e80..efbfcf41 100644 --- a/app/globals.css +++ b/app/globals.css @@ -6,8 +6,11 @@ @theme inline { --color-background: var(--background); --color-foreground: var(--foreground); - --font-sans: var(--font-geist-sans); + --font-sans: var(--font-poppins), ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + --font-title: var(--font-poppins), var(--font-poppins), sans-serif; --font-mono: var(--font-geist-mono); + --font-author: var(--font-author); + --font-poppins: var(--font-poppins); --color-sidebar-ring: var(--sidebar-ring); --color-sidebar-border: var(--sidebar-border); --color-sidebar-accent-foreground: var(--sidebar-accent-foreground); @@ -137,6 +140,9 @@ @apply border-border outline-ring/50; } body { - @apply bg-background text-foreground; + @apply bg-background text-foreground font-sans; + } + h1, h2, h3, h4, h5, h6 { + @apply font-title; } } diff --git a/app/layout.tsx b/app/layout.tsx index a9b718c3..ddcd95ed 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -4,7 +4,7 @@ import "./globals.css"; import {Providers} from "./providers"; import {cn} from "@/lib/utils"; import {ConsoleSilencer} from "@/components/wrappers/common/console-silencer"; -import {inter} from "@/fonts/fonts"; +import {author, geistMono, poppins} from "@/fonts/fonts"; const title = process.env.PROJECT_NAME ?? "App Title"; @@ -27,7 +27,7 @@ export default async function RootLayout({ - + {children} diff --git a/src/fonts/author/Author-Bold.ttf b/src/fonts/author/Author-Bold.ttf new file mode 100644 index 00000000..d36540d8 Binary files /dev/null and b/src/fonts/author/Author-Bold.ttf differ diff --git a/src/fonts/author/Author-BoldItalic.ttf b/src/fonts/author/Author-BoldItalic.ttf new file mode 100644 index 00000000..441b3968 Binary files /dev/null and b/src/fonts/author/Author-BoldItalic.ttf differ diff --git a/src/fonts/author/Author-Extralight.ttf b/src/fonts/author/Author-Extralight.ttf new file mode 100644 index 00000000..7395cd4f Binary files /dev/null and b/src/fonts/author/Author-Extralight.ttf differ diff --git a/src/fonts/author/Author-ExtralightItalic.ttf b/src/fonts/author/Author-ExtralightItalic.ttf new file mode 100644 index 00000000..678b7d35 Binary files /dev/null and b/src/fonts/author/Author-ExtralightItalic.ttf differ diff --git a/src/fonts/author/Author-Italic.ttf b/src/fonts/author/Author-Italic.ttf new file mode 100644 index 00000000..365ea4a9 Binary files /dev/null and b/src/fonts/author/Author-Italic.ttf differ diff --git a/src/fonts/author/Author-Light.ttf b/src/fonts/author/Author-Light.ttf new file mode 100644 index 00000000..8da56aa5 Binary files /dev/null and b/src/fonts/author/Author-Light.ttf differ diff --git a/src/fonts/author/Author-LightItalic.ttf b/src/fonts/author/Author-LightItalic.ttf new file mode 100644 index 00000000..946b9f62 Binary files /dev/null and b/src/fonts/author/Author-LightItalic.ttf differ diff --git a/src/fonts/author/Author-Medium.ttf b/src/fonts/author/Author-Medium.ttf new file mode 100644 index 00000000..12cfe905 Binary files /dev/null and b/src/fonts/author/Author-Medium.ttf differ diff --git a/src/fonts/author/Author-MediumItalic.ttf b/src/fonts/author/Author-MediumItalic.ttf new file mode 100644 index 00000000..6af57d3c Binary files /dev/null and b/src/fonts/author/Author-MediumItalic.ttf differ diff --git a/src/fonts/author/Author-Regular.ttf b/src/fonts/author/Author-Regular.ttf new file mode 100644 index 00000000..6a7051bf Binary files /dev/null and b/src/fonts/author/Author-Regular.ttf differ diff --git a/src/fonts/author/Author-Semibold.ttf b/src/fonts/author/Author-Semibold.ttf new file mode 100644 index 00000000..a7289046 Binary files /dev/null and b/src/fonts/author/Author-Semibold.ttf differ diff --git a/src/fonts/author/Author-SemiboldItalic.ttf b/src/fonts/author/Author-SemiboldItalic.ttf new file mode 100644 index 00000000..bad24531 Binary files /dev/null and b/src/fonts/author/Author-SemiboldItalic.ttf differ diff --git a/src/fonts/author/Author-Variable.ttf b/src/fonts/author/Author-Variable.ttf new file mode 100644 index 00000000..1106b729 Binary files /dev/null and b/src/fonts/author/Author-Variable.ttf differ diff --git a/src/fonts/author/Author-VariableItalic.ttf b/src/fonts/author/Author-VariableItalic.ttf new file mode 100644 index 00000000..8a5be834 Binary files /dev/null and b/src/fonts/author/Author-VariableItalic.ttf differ diff --git a/src/fonts/fonts.ts b/src/fonts/fonts.ts index eb2f2566..52f80b0f 100644 --- a/src/fonts/fonts.ts +++ b/src/fonts/fonts.ts @@ -1,5 +1,27 @@ -import {Inter} from "next/font/google"; +import {Poppins} from "next/font/google"; +import localFont from "next/font/local"; +export const poppins = Poppins({ + subsets: ["latin"], + weight: ["400", "500", "600", "700"], + variable: "--font-poppins", +}); +export const author = localFont({ + src: [ + { + path: "./author/Author-Variable.ttf", + style: "normal", + }, + { + path: "./author/Author-VariableItalic.ttf", + style: "italic", + }, + ], + variable: "--font-author", +}); -export const inter = Inter({subsets: ["latin"]}); +export const geistMono = localFont({ + src: "./geist/GeistMonoVF.woff", + variable: "--font-geist-mono", +}); diff --git a/app/fonts/GeistMonoVF.woff b/src/fonts/geist/GeistMonoVF.woff similarity index 100% rename from app/fonts/GeistMonoVF.woff rename to src/fonts/geist/GeistMonoVF.woff diff --git a/app/fonts/GeistVF.woff b/src/fonts/geist/GeistVF.woff similarity index 100% rename from app/fonts/GeistVF.woff rename to src/fonts/geist/GeistVF.woff