Merge version_1 into main #1
@@ -7,6 +7,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { Public_Sans } from "next/font/google";
|
||||
import { Archivo } from "next/font/google";
|
||||
import { Raleway } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -20,12 +22,10 @@ export const metadata: Metadata = {
|
||||
},
|
||||
};
|
||||
|
||||
const publicSans = Public_Sans({
|
||||
variable: "--font-public-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
|
||||
|
||||
const raleway = Raleway({
|
||||
variable: "--font-raleway",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
@@ -37,7 +37,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
|
||||
<body className={`${raleway.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -11,7 +11,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-inter), sans-serif;
|
||||
font-family: var(--font-raleway), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-public-sans), sans-serif;
|
||||
font-family: var(--font-raleway), sans-serif;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user