Skip to content

Commit

Permalink
fix: change font name (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
jxmoose authored Oct 26, 2024
1 parent 811aba9 commit c420286
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions app/(auth)/auth-styles.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from 'styled-components';
import COLORS from '@/styles/colors';
import { BespokeSans } from '@/styles/fonts';
import { Sans } from '@/styles/fonts';
import { H3, P } from '@/styles/text';

export const Container = styled.div`
font-family: ${BespokeSans.style.fontFamily}, sans-serif;
font-family: ${Sans.style.fontFamily}, sans-serif;
display: flex;
flex-direction: column;
align-items: center;
Expand Down Expand Up @@ -41,13 +41,13 @@ export const Form = styled.div`
`;

export const Label = styled(P)`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
font-weight: 500;
margin-bottom: -0.2rem;
`;

export const Input = styled.input`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
padding: 0.7rem;
border: 1px solid ${COLORS.gray4};
border-radius: 8px;
Expand All @@ -57,7 +57,7 @@ export const Input = styled.input`
`;

export const Button = styled.button`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
background-color: ${COLORS.gray12};
color: white;
font-size: 1rem;
Expand Down Expand Up @@ -98,7 +98,7 @@ export const Separator = styled.div`
`;

export const Link = styled.a`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
// TODO: CHANGE COLOR TO BLUE ONCE COLORS.TS IS UPDATED
color: #3978ff;
text-decoration: none;
Expand All @@ -114,14 +114,14 @@ export const SmallBuffer = styled.div`

// TODO: Temporarily added to verify that supabase login functionality actually works
export const LoginMessage = styled(P)<{ isError: boolean }>`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
color: ${({ isError }) => (isError ? 'red' : 'green')};
text-align: center;
margin-top: 0.5rem;
`;

export const Footer = styled.div`
font-family: ${BespokeSans.style.fontFamily};
font-family: ${Sans.style.fontFamily};
text-align: center;
margin-top: 1rem;
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Metadata } from 'next';
import StyledComponentsRegistry from '@/lib/registry';
import { BespokeSans } from '../styles/fonts';
import { Sans } from '../styles/fonts';
import '../styles/global.css';

// site metadata - what shows up on embeds
Expand All @@ -16,7 +16,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body className={BespokeSans.className}>
<body className={Sans.className}>
<StyledComponentsRegistry>{children}</StyledComponentsRegistry>
</body>
</html>
Expand Down
4 changes: 2 additions & 2 deletions app/onboarding/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import NextImage from 'next/image';
import Link from 'next/link';
import styled from 'styled-components';
import { BespokeSans } from '@/styles/fonts';
import { Sans } from '@/styles/fonts';
import COLORS from '../../styles/colors';

export const Background = styled.main`
Expand Down Expand Up @@ -102,7 +102,7 @@ export const ContinueButton = styled.button`
`;

export const ContinueText = styled.text`
${BespokeSans.style}
${Sans.style}
color: white;
font-size: 14px;
padding: 10px;
Expand Down
6 changes: 3 additions & 3 deletions styles/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import localFont from 'next/font/local';

const BespokeSans = localFont({
const Sans = localFont({
src: [
{
path: '../public/fonts/BespokeSans_Complete/Fonts/OTF/BespokeSans-Light.otf',
Expand Down Expand Up @@ -30,7 +30,7 @@ const BespokeSans = localFont({
],
});

const BespokeSerif = localFont({
const Serif = localFont({
src: [
{
path: '../public/fonts/BespokeSerif_Complete/Fonts/OTF/BespokeSerif-Light.otf',
Expand Down Expand Up @@ -85,4 +85,4 @@ const ClashGrotesk = localFont({
],
});

export { BespokeSans, BespokeSerif, ClashGrotesk };
export { Sans, Serif, ClashGrotesk };
4 changes: 2 additions & 2 deletions styles/text.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import styled, { css } from 'styled-components';
import { BespokeSans } from './fonts';
import { Sans } from './fonts';

interface TextProps {
$color?: string;
Expand All @@ -10,7 +10,7 @@ interface TextProps {
}

const TextStyles = css<TextProps>`
${BespokeSans.style}
${Sans.style}
font-weight: ${({ $fontWeight }) => $fontWeight || '700'};
color: ${({ $color }) => $color || 'black'};
text-align: ${({ $align }) => $align};
Expand Down

0 comments on commit c420286

Please sign in to comment.