Merge version_2 into main
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
@@ -4,13 +4,13 @@
|
||||
/* Base units */
|
||||
/* --vw is set by ThemeProvider */
|
||||
|
||||
--background: #ffffff;;
|
||||
--card: #fcfcfc;;
|
||||
--foreground: #120a00e6;;
|
||||
--primary-cta: #ff8c42;;
|
||||
--secondary-cta: #ffffff;;
|
||||
--accent: #e2e2e2;;
|
||||
--background-accent: #c4c4c4;;
|
||||
--background: #000000;;
|
||||
--card: #1a1a1a;;
|
||||
--foreground: #ffffff;;
|
||||
--primary-cta: #ffdd00;;
|
||||
--secondary-cta: #1a1a1a;;
|
||||
--accent: #ffdd00;;
|
||||
--background-accent: #333333;;
|
||||
|
||||
/* text sizing - set by ThemeProvider */
|
||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||
@@ -495,7 +495,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-dm-sans), sans-serif;
|
||||
font-family: var(--font-inter), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -508,5 +508,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-dm-sans), sans-serif;
|
||||
font-family: var(--font-inter), sans-serif;
|
||||
}
|
||||
@@ -1,14 +1,20 @@
|
||||
import type { Metadata } from "next";
|
||||
import { DM_Sans } from "next/font/google";
|
||||
import { Inter, Poppins } from "next/font/google";
|
||||
import "./globals.css";
|
||||
import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
|
||||
const dmSans = DM_Sans({
|
||||
variable: "--font-dm-sans",
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
const poppins = Poppins({
|
||||
variable: "--font-poppins",
|
||||
subsets: ["latin"],
|
||||
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
|
||||
});
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Disruptive Fund - Israeli VC Investing in Innovation",
|
||||
description: "Israeli venture capital fund backing breakthrough startups. We invest in deep tech, SaaS, and fintech innovations from Israel and the region.",
|
||||
@@ -43,7 +49,7 @@ export default function RootLayout({
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body
|
||||
className={dmSans.variable}
|
||||
className={`${inter.variable} ${poppins.variable}`}
|
||||
>
|
||||
<Tag />
|
||||
{children}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"use client"
|
||||
"use client";
|
||||
|
||||
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
|
||||
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
|
||||
|
||||
Reference in New Issue
Block a user