Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding custom fonts #22

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div className={manrope.className}>
<div>
<Head>
<title>{PUB_APP_NAME}</title>
</Head>
Expand Down
41 changes: 39 additions & 2 deletions pages/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-Regular.eot
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-Regular.ttf
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-Regular.woff
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-Regular.woff2
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-SemiBold.eot
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-SemiBold.ttf
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-SemiBold.woff
Binary file not shown.
Binary file added public/fonts/PublicSans/PublicSans-SemiBold.woff2
Binary file not shown.
Loading