elal
/
wych.dev
mirror of https://github.com/almqv/wych.dev
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fonts fix

Browse Source
pull/1/head
Elias Almqvist 1 year ago
parent 341aae53a9
commit a1b6d0fead
No known key found for this signature in database
GPG Key ID: E31A99CE3E75A158
6 changed files with 36 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      package.json
  2. 11
      pnpm-lock.yaml
  3. 9
      src/app/layout.tsx
  4. 9
      src/components/fonts.tsx
  5. 14
      src/components/layout/header.tsx
  6. 4
      src/components/layout/nav.tsx

1
package.json
Unescape View File

@ -22,6 +22,7 @@
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"clsx": "^2.1.0", "clsx": "^2.1.0",
"cmdk": "^1.0.0", "cmdk": "^1.0.0",
"geist": "^1.3.0",
"lucide-react": "^0.363.0", "lucide-react": "^0.363.0",
"next": "14.1.4", "next": "14.1.4",
"next-themes": "^0.3.0", "next-themes": "^0.3.0",

11
pnpm-lock.yaml
Unescape View File

@ -38,6 +38,9 @@ dependencies:
cmdk: cmdk:
specifier: ^1.0.0 specifier: ^1.0.0
version: 1.0.0(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) version: 1.0.0(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0)
geist:
specifier: ^1.3.0
version: 1.3.0(next@14.1.4)
lucide-react: lucide-react:
specifier: ^0.363.0 specifier: ^0.363.0
version: 0.363.0(react@18.2.0) version: 0.363.0(react@18.2.0)
@ -2129,6 +2132,14 @@ packages:
resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
dev: true dev: true
/geist@1.3.0(next@14.1.4):
resolution: {integrity: sha512-IoGBfcqVEYB4bEwsfHd35jF4+X9LHRPYZymHL4YOltHSs9LJa24DYs1Z7rEMQ/lsEvaAIc61Y9aUxgcJaQ8lrg==}
peerDependencies:
next: '>=13.2.0 <15.0.0-0'
dependencies:
next: 14.1.4(react-dom@18.2.0)(react@18.2.0)
dev: false
/get-intrinsic@1.2.4: /get-intrinsic@1.2.4:
resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}

9
src/app/layout.tsx
Unescape View File

@ -1,5 +1,5 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Lato as FontSans } from "next/font/google";
import "./globals.css"; import "./globals.css";
export const metadata: Metadata = { export const metadata: Metadata = {
@ -11,10 +11,7 @@ import { cn } from "@/lib/utils";
import { ThemeProvider } from "@/components/theme-provider"; import { ThemeProvider } from "@/components/theme-provider";
import Layout from "@/components/layout"; import Layout from "@/components/layout";
const fontSans = FontSans({ import fonts from "@/components/fonts";
weight: ["400", "700"],
subsets: ["latin", "latin-ext"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
@ -26,7 +23,7 @@ export default function RootLayout({
<body <body
className={cn( className={cn(
"min-h-screen bg-background text-foreground antialiased", "min-h-screen bg-background text-foreground antialiased",
fontSans.className, fonts.sans.className
)} )}
> >
<ThemeProvider <ThemeProvider

9
src/components/fonts.tsx
Unescape View File

@ -0,0 +1,9 @@
import { GeistMono } from "geist/font/mono";
import { GeistSans } from "geist/font/sans";
const fonts = {
sans: GeistSans,
mono: GeistMono,
};
export default fonts;

14
src/components/layout/header.tsx
Unescape View File

@ -2,13 +2,23 @@ import Logo from "@/components/logo";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import Nav from "./nav"; import Nav from "./nav";
import Link from "next/link"; import Link from "next/link";
import { cn } from "@/lib/utils";
import fonts from "@/components/fonts";
const Header = () => ( const Header = () => (
<header className="w-full flex flex-col justify-center items-center"> <header className="w-full flex flex-col justify-center items-center">
<div className="py-2 px-4 md:px-8 flex flex-row justify-between w-full max-w-screen-2xl"> <div className="py-2 px-4 md:px-8 flex flex-row justify-between w-full max-w-screen-2xl">
<Link href="/" className="flex flex-row items-center gap-x-2 hover:opacity-80 transition-opacity"> <Link
href="/"
className="flex flex-row items-center gap-x-2 hover:opacity-80 transition-opacity"
>
<Logo className="h-6 w-6" /> <Logo className="h-6 w-6" />
<span className="font-mono text-2xl hidden md:inline-block">wych.dev</span> <span
className={cn("text-2xl hidden md:inline-block", fonts.mono.className)}
>
wych.dev
</span>
</Link> </Link>
<Nav /> <Nav />
</div> </div>

4
src/components/layout/nav.tsx
Unescape View File

@ -17,10 +17,6 @@ import {
import { import {
GalleryHorizontalEnd, GalleryHorizontalEnd,
Home, Home,
PanelRightClose,
Scroll,
Search,
Settings,
SunMoon, SunMoon,
} from "lucide-react"; } from "lucide-react";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";

Write Preview
Loading…
Cancel
Save