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.

Sign up for GitHub

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

v3 - replace current fonts with Britti sans #722

Merged
merged 6 commits into from
Sep 27, 2024
Merged

v3 - replace current fonts with Britti sans #722

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e13c373
replace figtree and recoleta with britti-sans
anemne Sep 27, 2024
eaa5ebd
Update .storybook/preview.tsx
anemne Sep 27, 2024
eb7666c
Update src/app/layout.tsx
anemne Sep 27, 2024
f4ab0b9
Merge branch 'v3' into v3-replace-font
anemne Sep 27, 2024
b1e8036
resolve conflict
anemne Sep 27, 2024
399bb65
fix up font path
anemne Sep 27, 2024
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
15 changes: 4 additions & 11 deletions .storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import React from "react";
import type { Preview } from "@storybook/react";
import { Figtree } from "next/font/google";
import "../src/styles/global.css";
import localFont from "next/font/local";

const fontRecoleta = localFont({
src: "../../public/recoleta.otf",
variable: "--font-recoleta",
});

const fontFigtree = Figtree({
subsets: ["latin"],
weight: "400",
variable: "--font-figtree",
const fontBrittiSans = localFont({
src: "../../public/fonts/britti-sans-variable.woff2",
mathiazom marked this conversation as resolved.
Show resolved Hide resolved
variable: "--font-britti-sans",
});

const preview: Preview = {
Expand Down Expand Up @@ -42,7 +35,7 @@ const preview: Preview = {
}

return (
<div className={`${fontFigtree.variable} ${fontRecoleta.variable}`}>
<div className={fontBrittiSans.variable}>
<Story />
</div>
);
Expand Down
Binary file added public/fonts/britti-sans-variable.woff2
View file
Open in desktop
mathiazom marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
15 changes: 4 additions & 11 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Metadata } from "next";
import { Figtree } from "next/font/google";
import localFont from "next/font/local";
import { draftMode } from "next/headers";

Expand All @@ -11,15 +10,9 @@ import { loadStudioQuery } from "studio/lib/store";

import "src/styles/global.css";

const fontRecoleta = localFont({
src: "../../public/recoleta.otf",
variable: "--font-recoleta",
});

const fontFigtree = Figtree({
subsets: ["latin"],
weight: "400",
variable: "--font-figtree",
const fontBrittiSans = localFont({
src: "../../public/_assets/fonts/britti-sans-variable.woff2",
variable: "--font-britti-sans",
});

export async function generateMetadata(): Promise<Metadata> {
Expand All @@ -45,7 +38,7 @@ export default async function RootLayout({
}
return (
<html lang={siteLang}>
<body className={`${fontFigtree.variable} ${fontRecoleta.variable}`}>
<body className={`${fontBrittiSans.variable}`}>
anemne marked this conversation as resolved.
Show resolved Hide resolved
{children}
{draftMode().isEnabled && <LiveVisualEditing />}
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/blog/components/hero/blogHero.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
border-radius: 1.5rem;
background-color: var(--primary-white);
color: var(--primary-black);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1rem;
font-weight: 400;
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion src/blog/components/legal/legal.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

.linkTitle {
color: var(--primary-black, #1f1f1f);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1.5rem;
font-style: normal;
font-weight: 700;
Expand Down
2 changes: 1 addition & 1 deletion src/blog/components/postCard/postCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
text-decoration: none;
text-wrap: wrap;
color: var(--primary-black);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1.25rem;
font-weight: 400;
line-height: 140%;
Expand Down
2 changes: 1 addition & 1 deletion src/components/buttons/button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
border-radius: 1.5625rem;
border: none;
background: var(--primary-white);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
text-wrap: nowrap;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/link/link.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
align-items: center;
text-decoration: none;
gap: 0.5rem;
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1.125rem;
font-weight: 500;

Expand Down Expand Up @@ -56,7 +56,7 @@
color: var(--primary-black);
cursor: pointer;
text-decoration: none;
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1.25rem;
font-weight: 500;

Expand All @@ -73,7 +73,7 @@
color: var(--primary-white);
cursor: pointer;
text-decoration: none;
font-family: var(--font-recoleta);
font-family: var(--font-britti-sans);
font-size: 2rem;
font-weight: 400;

Expand Down
2 changes: 1 addition & 1 deletion src/components/linkButton/linkButton.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
gap: 0.6rem;
border-radius: 1.5625rem;
border: none;
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
text-decoration: none;

padding: 0.5rem 1.25rem;
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/footer/footer.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

.whiteColor {
color: var(--primary-white) !important;
font-family: var(--font-recoleta) !important;
font-family: var(--font-britti-sans) !important;
font-size: 2rem !important;
font-weight: 400 !important;
}
2 changes: 1 addition & 1 deletion src/components/sections/testimonials/testimonials.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
padding: 0.5rem;
background-color: var(--primary-white);
color: var(--primary-black);
font-family: var(--font-recoleta);
font-family: var(--font-britti-sans);
align-items: center;
gap: 0.5rem;
border-radius: 0.9375rem;
Expand Down
2 changes: 1 addition & 1 deletion src/components/skipToMain/skipToMain.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

text-decoration: none;
color: var(--primary-white, #faf8f5);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
font-size: 1.25rem;
font-style: normal;
font-weight: 400;
Expand Down
4 changes: 2 additions & 2 deletions src/components/text/text.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.h3,
.bodySuperLarge {
color: var(--primary-black);
font-family: var(--font-recoleta);
font-family: var(--font-britti-sans);
}

.bodyLarge,
Expand All @@ -13,7 +13,7 @@
.caption,
.list {
color: var(--primary-black);
font-family: var(--font-figtree);
font-family: var(--font-britti-sans);
line-height: 140%;
}

Expand Down