Compare commits
38 Commits
version_10
...
version_24
| Author | SHA1 | Date | |
|---|---|---|---|
| d32ee7a9b8 | |||
| cfe2f6e7b3 | |||
| 14576fe71e | |||
| 85f3214ab1 | |||
| 57db48cd17 | |||
| 8f789fed77 | |||
| 58c6a0f648 | |||
| ff9e15f8b7 | |||
| 32920c6847 | |||
| 9f6d5d8935 | |||
| 03b0550822 | |||
| 29268e97be | |||
| 314e728781 | |||
| dab5b0604f | |||
| 6c4fb01520 | |||
| 5e91a75778 | |||
| 9d6e3c1421 | |||
| 5606ca6678 | |||
| c5c84519fd | |||
| f5894dc9b2 | |||
| 2f462cadc7 | |||
| 0f06a5ec68 | |||
| 5a20a4b800 | |||
| 3912acf2c6 | |||
| ee3d8a60f3 | |||
| 03d000979d | |||
| e7cc76d011 | |||
| e56dd016e1 | |||
| 4fa41fc645 | |||
| ac3f1bedc0 | |||
| 78f2f05331 | |||
| 48d00c771a | |||
| 46b1cdd330 | |||
| 9c4563c1ab | |||
| 54bddc7497 | |||
| ba77c9937f | |||
| abb2e7d098 | |||
| df19e45afd |
@@ -7,6 +7,11 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { Roboto } from "next/font/google";
|
||||
import { Montserrat } from "next/font/google";
|
||||
import { Manrope } from "next/font/google";
|
||||
import { Nunito } from "next/font/google";
|
||||
import { Libre_Baskerville } from "next/font/google";
|
||||
import { Archivo } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -21,10 +26,26 @@ export const metadata: Metadata = {
|
||||
},
|
||||
};
|
||||
|
||||
const roboto = Roboto({
|
||||
variable: "--font-roboto",
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const libreBaskerville = Libre_Baskerville({
|
||||
variable: "--font-libre-baskerville",
|
||||
subsets: ["latin"],
|
||||
weight: ["400", "700"],
|
||||
});
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
weight: ["100", "300", "400", "500", "700", "900"],
|
||||
});
|
||||
|
||||
export default function RootLayout({
|
||||
@@ -35,7 +56,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${roboto.variable} antialiased`}>
|
||||
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -11,7 +11,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-roboto), sans-serif;
|
||||
font-family: var(--font-inter), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-roboto), sans-serif;
|
||||
font-family: var(--font-libre-baskerville), serif;
|
||||
}
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
--accent: #ffffff;
|
||||
--background-accent: #ffffff; */
|
||||
|
||||
--background: #f5f4ef;
|
||||
--card: #dad6cd;
|
||||
--foreground: #2a2928;
|
||||
--primary-cta: #2a2928;
|
||||
--primary-cta-text: #f5f4ef;
|
||||
--secondary-cta: #ecebea;
|
||||
--secondary-cta-text: #2a2928;
|
||||
--accent: #ffffff;
|
||||
--background-accent: #c6b180;
|
||||
--background: #f6f0e9;
|
||||
--card: #efe7dd;
|
||||
--foreground: #2b180a;
|
||||
--primary-cta: #2b180a;
|
||||
--primary-cta-text: #f6f0e9;
|
||||
--secondary-cta: #efe7dd;
|
||||
--secondary-cta-text: #2b180a;
|
||||
--accent: #94877c;
|
||||
--background-accent: #afa094;
|
||||
|
||||
/* text sizing - set by ThemeProvider */
|
||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||
|
||||
Reference in New Issue
Block a user