Compare commits
16 Commits
version_2
...
version_10
| Author | SHA1 | Date | |
|---|---|---|---|
| d103500dbb | |||
| 086d8e8342 | |||
| 0016b9e967 | |||
| aa68d81696 | |||
| 6f856809ba | |||
| 7d4bb39d58 | |||
| 415cce4617 | |||
| 7c94d9b900 | |||
| ca4ea2ad4e | |||
| 7fef153ed8 | |||
| b6576d2b8e | |||
| 3e8bbd4d44 | |||
| af2a5505d6 | |||
| 448756c94f | |||
| 4d08328d6f | |||
| 7f10e96524 |
@@ -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 { Source_Sans_3 } from "next/font/google";
|
import { Source_Sans_3 } from "next/font/google";
|
||||||
|
import { Open_Sans } from "next/font/google";
|
||||||
|
import { DM_Sans } from "next/font/google";
|
||||||
|
import { Libre_Baskerville } from "next/font/google";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -20,8 +23,17 @@ export const metadata: Metadata = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const sourceSans3 = Source_Sans_3({
|
|
||||||
variable: "--font-source-sans-3",
|
|
||||||
|
|
||||||
|
|
||||||
|
const libreBaskerville = Libre_Baskerville({
|
||||||
|
variable: "--font-libre-baskerville",
|
||||||
|
subsets: ["latin"],
|
||||||
|
weight: ["400", "700"],
|
||||||
|
});
|
||||||
|
const inter = Inter({
|
||||||
|
variable: "--font-inter",
|
||||||
subsets: ["latin"],
|
subsets: ["latin"],
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -33,7 +45,7 @@ export default function RootLayout({
|
|||||||
return (
|
return (
|
||||||
<html lang="en" suppressHydrationWarning>
|
<html lang="en" suppressHydrationWarning>
|
||||||
<ServiceWrapper>
|
<ServiceWrapper>
|
||||||
<body className={`${sourceSans3.variable} antialiased`}>
|
<body className={`${libreBaskerville.variable} ${inter.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-source-sans-3), sans-serif;
|
font-family: var(--font-inter), 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-source-sans-3), sans-serif;
|
font-family: var(--font-libre-baskerville), serif;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,15 +10,15 @@
|
|||||||
--accent: #ffffff;
|
--accent: #ffffff;
|
||||||
--background-accent: #ffffff; */
|
--background-accent: #ffffff; */
|
||||||
|
|
||||||
--background: #f6f0e9;
|
--background: #ffffff;
|
||||||
--card: #efe7dd;
|
--card: #f9f9f9;
|
||||||
--foreground: #2b180a;
|
--foreground: #120a00e6;
|
||||||
--primary-cta: #2b180a;
|
--primary-cta: #FF7B05;
|
||||||
--primary-cta-text: #f6f0e9;
|
--primary-cta-text: #ffffff;
|
||||||
--secondary-cta: #efe7dd;
|
--secondary-cta: #f9f9f9;
|
||||||
--secondary-cta-text: #2b180a;
|
--secondary-cta-text: #120a00e6;
|
||||||
--accent: #94877c;
|
--accent: #e2e2e2;
|
||||||
--background-accent: #afa094;
|
--background-accent: #FF7B05;
|
||||||
|
|
||||||
/* 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