Merge version_4 into main
Merge version_4 into main
This commit was merged in pull request #3.
This commit is contained in:
@@ -4,21 +4,21 @@
|
||||
/* Base units */
|
||||
/* --vw is set by ThemeProvider */
|
||||
|
||||
/* --background: #f5f5f5;;
|
||||
--card: #ffffff;;
|
||||
--foreground: #1c1c1c;;
|
||||
--primary-cta: #1c1c1c;;
|
||||
--secondary-cta: #ffffff;;
|
||||
--accent: #15479c;;
|
||||
--background-accent: #a8cce8;; */
|
||||
/* --background: #0a0a0a;;
|
||||
--card: #1a1a1a;;
|
||||
--foreground: #ffffffe6;;
|
||||
--primary-cta: #fde047;;
|
||||
--secondary-cta: #1a1a1a;;
|
||||
--accent: #fde047;;
|
||||
--background-accent: #333333;; */
|
||||
|
||||
--background: #f5f5f5;;
|
||||
--card: #ffffff;;
|
||||
--foreground: #1c1c1c;;
|
||||
--primary-cta: #1c1c1c;;
|
||||
--secondary-cta: #ffffff;;
|
||||
--accent: #15479c;;
|
||||
--background-accent: #a8cce8;;
|
||||
--background: #0a0a0a;;
|
||||
--card: #1a1a1a;;
|
||||
--foreground: #ffffffe6;;
|
||||
--primary-cta: #fde047;;
|
||||
--secondary-cta: #1a1a1a;;
|
||||
--accent: #fde047;;
|
||||
--background-accent: #333333;;
|
||||
|
||||
/* text sizing - set by ThemeProvider */
|
||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import type { Metadata } from "next";
|
||||
import { Cormorant_Garamond } from "next/font/google";
|
||||
import { Inter } from "next/font/google";
|
||||
import "./globals.css";
|
||||
import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
|
||||
const cormorantGaramond = Cormorant_Garamond({
|
||||
variable: "--font-cormorant-garamond", subsets: ["latin"],
|
||||
weight: ["300", "400", "500", "600", "700"],
|
||||
const inter = Inter({
|
||||
variable: "--font-inter", subsets: ["latin"],
|
||||
});
|
||||
|
||||
export const metadata: Metadata = {
|
||||
@@ -37,7 +36,7 @@ export default function RootLayout({
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body
|
||||
className={cormorantGaramond.variable}
|
||||
className={inter.variable}
|
||||
>
|
||||
<Tag />
|
||||
{children}
|
||||
|
||||
@@ -16,7 +16,7 @@ export default function LandingPage() {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="bounce-effect"
|
||||
defaultTextAnimation="background-highlight"
|
||||
borderRadius="pill"
|
||||
borderRadius="sharp"
|
||||
contentWidth="mediumLarge"
|
||||
sizing="mediumLargeSizeMediumTitles"
|
||||
background="plain"
|
||||
|
||||
Reference in New Issue
Block a user