Compare commits
28 Commits
version_11
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| cec5b8c579 | |||
| 8dcd07f5ec | |||
| c9eec2752f | |||
| b0996b6a9e | |||
| d916a4d1a4 | |||
| 50bd1a9ccc | |||
| 74cedc7bf6 | |||
| 891dc80a99 | |||
| 06097125fd | |||
| 9beb925d32 | |||
| b5b6bd6b4a | |||
| c808d9c7d2 | |||
| d4c1c1432a | |||
| a05b2785ae | |||
| cf5d91b376 | |||
| 98d1c31676 | |||
| a9fd53ee7e | |||
| 0c7a3f595c | |||
| b30b5467d2 | |||
| c6ae8a8ccb | |||
| 2cb9e18343 | |||
| 34dea54c1c | |||
| ef1b6ee8c3 | |||
| 7d605f8813 | |||
| ad39b34554 | |||
| baba5c6a0b | |||
| 117df7cd62 | |||
| b46c1eeac0 |
@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
|
||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { Source_Sans_3 } from "next/font/google";
|
||||
import { Public_Sans } from "next/font/google";
|
||||
import { Poppins } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -22,13 +23,11 @@ export const metadata: Metadata = {
|
||||
};
|
||||
|
||||
|
||||
const publicSans = Public_Sans({
|
||||
variable: "--font-public-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
|
||||
const poppins = Poppins({
|
||||
variable: "--font-poppins",
|
||||
subsets: ["latin"],
|
||||
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
|
||||
});
|
||||
|
||||
export default function RootLayout({
|
||||
@@ -39,7 +38,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
|
||||
<body className={`${poppins.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -11,7 +11,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-inter), sans-serif;
|
||||
font-family: var(--font-poppins), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-public-sans), sans-serif;
|
||||
font-family: var(--font-poppins), sans-serif;
|
||||
}
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
--accent: #ffffff;
|
||||
--background-accent: #ffffff; */
|
||||
|
||||
--background: #fffafa;
|
||||
--card: #fff7f7;
|
||||
--foreground: #a731c1;
|
||||
--primary-cta: #e63946;
|
||||
--primary-cta-text: #fffafa;
|
||||
--secondary-cta: #ffffff;
|
||||
--secondary-cta-text: #1a0000;
|
||||
--accent: #f5c4c7;
|
||||
--background-accent: #f09199;
|
||||
--background: #ffffff;
|
||||
--card: #f9f9f9;
|
||||
--foreground: #000612e6;
|
||||
--primary-cta: #106EFB;
|
||||
--primary-cta-text: #ffffff;
|
||||
--secondary-cta: #f9f9f9;
|
||||
--secondary-cta-text: #000612e6;
|
||||
--accent: #e2e2e2;
|
||||
--background-accent: #106EFB;
|
||||
|
||||
/* text sizing - set by ThemeProvider */
|
||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||
|
||||
Reference in New Issue
Block a user