Merge version_10 into main
Merge version_10 into main
This commit was merged in pull request #10.
This commit is contained in:
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { Nunito } from "next/font/google";
|
||||
import { Open_Sans } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -41,8 +42,13 @@ export const metadata: Metadata = {
|
||||
},
|
||||
};
|
||||
|
||||
const nunito = Nunito({
|
||||
variable: "--font-nunito",
|
||||
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const openSans = Open_Sans({
|
||||
variable: "--font-open-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
@@ -54,7 +60,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${nunito.variable} antialiased`}>
|
||||
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
--foreground: #29dfee;
|
||||
--primary-cta: #b83fe7;
|
||||
--primary-cta-text: #000000;
|
||||
--secondary-cta: #e0e0e0;
|
||||
--secondary-cta: #20230e;
|
||||
--secondary-cta-text: #2a2a2a;
|
||||
--accent: #d8bfd8;
|
||||
--background-accent: #d1d8e0;
|
||||
|
||||
Reference in New Issue
Block a user