Skip to content

Commit 2a5ddd6

Browse files
committed
feat(ui): add Geist fonts
1 parent d6adc67 commit 2a5ddd6

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

apps/ui/src/app/globals.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
body {
99
@apply m-0;
1010
font-family:
11+
var(--font-geist),
1112
-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
1213
"Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
1314
-webkit-font-smoothing: antialiased;
@@ -16,7 +17,7 @@ body {
1617

1718
code {
1819
font-family:
19-
source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
20+
var(--font-geist-mono), source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
2021
}
2122

2223
:root {
@@ -133,6 +134,7 @@ code {
133134
* {
134135
@apply border-border outline-ring/50;
135136
}
137+
136138
body {
137139
@apply bg-background text-foreground;
138140
}
@@ -141,6 +143,7 @@ code {
141143
from {
142144
height: 0;
143145
}
146+
144147
to {
145148
height: var(--radix-accordion-content-height);
146149
}
@@ -150,6 +153,7 @@ code {
150153
from {
151154
height: var(--radix-accordion-content-height);
152155
}
156+
153157
to {
154158
height: 0;
155159
}
@@ -162,4 +166,4 @@ code {
162166

163167
@utility animate-accordion-up {
164168
animation: accordion-up 0.2s ease-out;
165-
}
169+
}

apps/ui/src/app/layout.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
1-
// eslint-disable-next-line import/order
2-
import "./globals.css";
1+
import { Geist, Geist_Mono } from "next/font/google";
32

43
import { Providers } from "@/components/providers";
54
import { getConfig } from "@/lib/config-server";
65

6+
import "./globals.css";
7+
78
import type { Metadata } from "next";
89
import type { ReactNode } from "react";
910

11+
const geistMono = Geist_Mono({
12+
subsets: ["latin"],
13+
weight: ["400", "500", "600", "700"],
14+
variable: "--font-geist-mono",
15+
});
16+
17+
const geist = Geist({
18+
subsets: ["latin"],
19+
weight: ["400", "500", "600", "700"],
20+
variable: "--font-geist",
21+
});
22+
1023
export const dynamic = "force-dynamic";
1124

1225
export const metadata: Metadata = {
@@ -39,7 +52,9 @@ export default function RootLayout({ children }: { children: ReactNode }) {
3952

4053
return (
4154
<html lang="en" suppressHydrationWarning>
42-
<body className="min-h-screen font-sans antialiased">
55+
<body
56+
className={`min-h-screen font-sans antialiased ${geist.className} ${geistMono.variable}`}
57+
>
4358
<Providers config={config}>{children}</Providers>
4459
</body>
4560
</html>

0 commit comments

Comments
 (0)