diff --git a/pages/_app.tsx b/pages/_app.tsx index f357c14..fbace5a 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,21 +1,16 @@ import { RootContextProvider } from "@/context"; import { Layout } from "@/components/layout"; import AlertContainer from "@/components/alert/alert-container"; -import { Manrope } from "next/font/google"; import "@aragon/ods/index.css"; import "@/pages/globals.css"; import { PUB_APP_NAME } from "@/constants"; import Head from "next/head"; -const manrope = Manrope({ - subsets: ["latin"], -}); - export default function AragonetteApp({ Component, pageProps }: any) { // const initialState = cookieToInitialState(config, headers().get('cookie')) return ( -
+
{PUB_APP_NAME} diff --git a/pages/globals.css b/pages/globals.css index 587e7f4..c949a88 100644 --- a/pages/globals.css +++ b/pages/globals.css @@ -5,7 +5,7 @@ @layer base { :root { --tw-text-opacity: 1; - + /* Primary */ --ods-color-primary-50: 254 241 249; --ods-color-primary-100: 252 222 241; @@ -79,11 +79,44 @@ } } +/* Main font */ +@font-face { + font-family: "Public Sans"; + src: + url(/fonts/PublicSans/PublicSans-SemiBold.woff2) format("woff2"), + url(/fonts/PublicSans/PublicSans-SemiBold.woff) format("woff"), + url(/fonts/PublicSans/PublicSans-SemiBold.ttf) format("truetype"); + font-weight: 600; +} + +@font-face { + font-family: "Public Sans"; + src: + url(/fonts/PublicSans/PublicSans-Regular.woff2) format("woff2"), + url(/fonts/PublicSans/PublicSans-Regular.woff) format("woff"), + url(/fonts/PublicSans/PublicSans-Regular.ttf) format("truetype"); + font-weight: 400; +} + +/* Titles font */ + +@font-face { + font-family: "Clash Grotesk"; + src: + url(/fonts/ClashGrotesk/ClashDisplay-Semibold.woff2) format("woff2"), + url(/fonts/ClashGrotesk/ClashDisplay-Semibold.woff) format("woff"), + url(/fonts/ClashGrotesk/ClashDisplay-Semibold.ttf) format("truetype"); + font-weight: 600; +} + body { /* Variables imported from layout.tsx > @aragon/ods */ color: var(--ods-color-neutral-800); background-color: var(--ods-color-neutral-50); - font-family: var(--ods-font-family); + + /* font-family: var(--ods-font-family); */ + /* Custom */ + font-family: "Public Sans"; } h1, @@ -94,6 +127,10 @@ h5, h6 { /* Variables imported from layout.tsx > @aragon/ods */ color: var(--ods-color-neutral-800); + + /* Custom */ + font-family: "Clash Grotesk"; + font-weight: 600; } p, diff --git a/public/fonts/ClashGrotesk/ClashDisplay-Semibold.eot b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.eot new file mode 100644 index 0000000..6ae3364 Binary files /dev/null and b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.eot differ diff --git a/public/fonts/ClashGrotesk/ClashDisplay-Semibold.ttf b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.ttf new file mode 100644 index 0000000..6715249 Binary files /dev/null and b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.ttf differ diff --git a/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff new file mode 100644 index 0000000..3b2f19f Binary files /dev/null and b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff differ diff --git a/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff2 b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff2 new file mode 100644 index 0000000..217e88e Binary files /dev/null and b/public/fonts/ClashGrotesk/ClashDisplay-Semibold.woff2 differ diff --git a/public/fonts/PublicSans/PublicSans-Regular.eot b/public/fonts/PublicSans/PublicSans-Regular.eot new file mode 100644 index 0000000..7defda5 Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-Regular.eot differ diff --git a/public/fonts/PublicSans/PublicSans-Regular.ttf b/public/fonts/PublicSans/PublicSans-Regular.ttf new file mode 100644 index 0000000..8afd7e0 Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-Regular.ttf differ diff --git a/public/fonts/PublicSans/PublicSans-Regular.woff b/public/fonts/PublicSans/PublicSans-Regular.woff new file mode 100644 index 0000000..82d4dfd Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-Regular.woff differ diff --git a/public/fonts/PublicSans/PublicSans-Regular.woff2 b/public/fonts/PublicSans/PublicSans-Regular.woff2 new file mode 100644 index 0000000..34852b2 Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-Regular.woff2 differ diff --git a/public/fonts/PublicSans/PublicSans-SemiBold.eot b/public/fonts/PublicSans/PublicSans-SemiBold.eot new file mode 100644 index 0000000..95a578a Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-SemiBold.eot differ diff --git a/public/fonts/PublicSans/PublicSans-SemiBold.ttf b/public/fonts/PublicSans/PublicSans-SemiBold.ttf new file mode 100644 index 0000000..45ec984 Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-SemiBold.ttf differ diff --git a/public/fonts/PublicSans/PublicSans-SemiBold.woff b/public/fonts/PublicSans/PublicSans-SemiBold.woff new file mode 100644 index 0000000..6b6ccc4 Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-SemiBold.woff differ diff --git a/public/fonts/PublicSans/PublicSans-SemiBold.woff2 b/public/fonts/PublicSans/PublicSans-SemiBold.woff2 new file mode 100644 index 0000000..097f2ee Binary files /dev/null and b/public/fonts/PublicSans/PublicSans-SemiBold.woff2 differ