diff --git a/.dockerignore b/.dockerignore index ee3da2d..08119a3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,8 +8,6 @@ README.md *.log .env* !.env.example -drizzle/*.sql -drizzle/*-journal .vscode .idea coverage diff --git a/src/app/layout.tsx b/src/app/layout.tsx index ef7e223..f548e29 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,6 +1,7 @@ import "~/styles/globals.css"; import { type Metadata } from "next"; +import { Inter, Playfair_Display, Geist_Mono } from "next/font/google"; import { TRPCReactProvider } from "~/trpc/react"; import { Toaster } from "~/components/ui/sonner"; @@ -16,6 +17,24 @@ export const metadata: Metadata = { icons: [{ rel: "icon", url: "/favicon.ico" }], }; +const inter = Inter({ + subsets: ["latin"], + variable: "--font-sans", + display: "swap", +}); + +const playfair = Playfair_Display({ + subsets: ["latin"], + variable: "--font-heading", + display: "swap", +}); + +const geistMono = Geist_Mono({ + subsets: ["latin"], + variable: "--font-geist-mono", + display: "swap", +}); + export default function RootLayout({ children, }: Readonly<{ children: React.ReactNode }>) { @@ -23,6 +42,7 @@ export default function RootLayout({
diff --git a/src/styles/globals.css b/src/styles/globals.css index 3a7e6fc..f0818ea 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -84,9 +84,9 @@ --color-input: hsl(var(--input)); --color-ring: hsl(var(--ring)); - --font-sans: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; - --font-heading: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif; - --font-mono: ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace; + --font-sans: var(--font-sans), ui-sans-serif, system-ui, sans-serif; + --font-heading: var(--font-heading), ui-serif, Georgia, serif; + --font-mono: var(--font-geist-mono), ui-monospace, monospace; --radius-sm: calc(var(--radius) - 4px); --radius-md: calc(var(--radius) - 2px);