Compare commits
15 Commits
version_2
...
version_13
| Author | SHA1 | Date | |
|---|---|---|---|
| 770b847829 | |||
| 5272db0950 | |||
| 29beaf814d | |||
| 791991301d | |||
| a492ee67c6 | |||
| 43c247ec89 | |||
| 571be59829 | |||
| 92a73964e9 | |||
| c7b7d747c3 | |||
| 18fbcb9b22 | |||
| f0c020d963 | |||
| 3acd7efaf7 | |||
| 541b848744 | |||
| ab5ed10f4d | |||
| 716fa4cff3 |
@@ -7,6 +7,7 @@ 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 { Public_Sans } from "next/font/google";
|
import { Public_Sans } from "next/font/google";
|
||||||
|
import { Open_Sans } from "next/font/google";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -19,7 +20,16 @@ export const metadata: Metadata = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const publicSans = Public_Sans({ variable: "--font-public-sans", subsets: ["latin"], });
|
|
||||||
|
|
||||||
|
const inter = Inter({
|
||||||
|
variable: "--font-inter",
|
||||||
|
subsets: ["latin"],
|
||||||
|
});
|
||||||
|
const openSans = Open_Sans({
|
||||||
|
variable: "--font-open-sans",
|
||||||
|
subsets: ["latin"],
|
||||||
|
});
|
||||||
|
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
children,
|
children,
|
||||||
@@ -29,7 +39,7 @@ export default function RootLayout({
|
|||||||
return (
|
return (
|
||||||
<html lang="en" suppressHydrationWarning>
|
<html lang="en" suppressHydrationWarning>
|
||||||
<ServiceWrapper>
|
<ServiceWrapper>
|
||||||
<body className={`${publicSans.variable} antialiased`}>
|
<body className={`${inter.variable} ${openSans.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-public-sans), sans-serif;
|
font-family: var(--font-open-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-public-sans), sans-serif;
|
font-family: var(--font-inter), sans-serif;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,15 +10,15 @@
|
|||||||
--accent: #ffffff;
|
--accent: #ffffff;
|
||||||
--background-accent: #ffffff; */
|
--background-accent: #ffffff; */
|
||||||
|
|
||||||
--background: #000000;
|
--background: #efebe5;
|
||||||
--card: #f9f9f9;
|
--card: #f7f2ea;
|
||||||
--foreground: #000612e6;
|
--foreground: #000000;
|
||||||
--primary-cta: #15479c;
|
--primary-cta: #000000;
|
||||||
--primary-cta-text: #ffffff;
|
--primary-cta-text: #efebe5;
|
||||||
--secondary-cta: #f9f9f9;
|
--secondary-cta: #ffffff;
|
||||||
--secondary-cta-text: #000612e6;
|
--secondary-cta-text: #000000;
|
||||||
--accent: #e2e2e2;
|
--accent: #ffffff;
|
||||||
--background-accent: #c4c4c4;
|
--background-accent: #e1b875;
|
||||||
|
|
||||||
/* 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