Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 81fc07ad74 | |||
| 8d775e47cc | |||
| 03bdb4cfcf | |||
| 810a6e37a8 | |||
| c23f48c229 |
@@ -7,6 +7,9 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
|
|||||||
import Tag from "@/tag/Tag";
|
import Tag from "@/tag/Tag";
|
||||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||||
import { Mulish } from "next/font/google";
|
import { Mulish } from "next/font/google";
|
||||||
|
import { Public_Sans } from "next/font/google";
|
||||||
|
import { Manrope } from "next/font/google";
|
||||||
|
import { DM_Sans } from "next/font/google";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -21,7 +24,16 @@ export const metadata: Metadata = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const mulish = Mulish({ variable: "--font-mulish", subsets: ["latin"] });
|
|
||||||
|
|
||||||
|
const manrope = Manrope({
|
||||||
|
variable: "--font-manrope",
|
||||||
|
subsets: ["latin"],
|
||||||
|
});
|
||||||
|
const dmSans = DM_Sans({
|
||||||
|
variable: "--font-dm-sans",
|
||||||
|
subsets: ["latin"],
|
||||||
|
});
|
||||||
|
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
children,
|
children,
|
||||||
@@ -31,7 +43,7 @@ export default function RootLayout({
|
|||||||
return (
|
return (
|
||||||
<html lang="en" suppressHydrationWarning>
|
<html lang="en" suppressHydrationWarning>
|
||||||
<ServiceWrapper>
|
<ServiceWrapper>
|
||||||
<body className={`${mulish.variable} antialiased`}>
|
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
|
||||||
<Tag />
|
<Tag />
|
||||||
{children}
|
{children}
|
||||||
<script
|
<script
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ html {
|
|||||||
body {
|
body {
|
||||||
background-color: var(--background);
|
background-color: var(--background);
|
||||||
color: var(--foreground);
|
color: var(--foreground);
|
||||||
font-family: var(--font-mulish), sans-serif;
|
font-family: var(--font-dm-sans), sans-serif;
|
||||||
position: relative;
|
position: relative;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
overscroll-behavior: none;
|
overscroll-behavior: none;
|
||||||
@@ -24,5 +24,5 @@ h3,
|
|||||||
h4,
|
h4,
|
||||||
h5,
|
h5,
|
||||||
h6 {
|
h6 {
|
||||||
font-family: var(--font-mulish), sans-serif;
|
font-family: var(--font-manrope), sans-serif;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,15 +10,15 @@
|
|||||||
--accent: #ffffff;
|
--accent: #ffffff;
|
||||||
--background-accent: #ffffff; */
|
--background-accent: #ffffff; */
|
||||||
|
|
||||||
--background: #ffffff;
|
--background: #fffafa;
|
||||||
--card: #fdfaf8;
|
--card: #fff7f7;
|
||||||
--foreground: #2b180a;
|
--foreground: #1a0000;
|
||||||
--primary-cta: #c6a664;
|
--primary-cta: #e63946;
|
||||||
--primary-cta-text: #ffffff;
|
--primary-cta-text: #fffafa;
|
||||||
--secondary-cta: #fdfaf8;
|
--secondary-cta: #ffffff;
|
||||||
--secondary-cta-text: #2b180a;
|
--secondary-cta-text: #1a0000;
|
||||||
--accent: #d4af37;
|
--accent: #f5c4c7;
|
||||||
--background-accent: #fdf5e6;
|
--background-accent: #f09199;
|
||||||
|
|
||||||
/* text sizing - set by ThemeProvider */
|
/* text sizing - set by ThemeProvider */
|
||||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||||
|
|||||||
Reference in New Issue
Block a user