Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Fix/no ref/font fix #12

Merged
merged 7 commits into from
Jun 3, 2024
Merged

Fix/no ref/font fix #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83bec88
fix: expanded mobile menu respects phone browser ui
yougotwill May 30, 2024
381677e
fix: remove unused fonts
yougotwill May 31, 2024
7e1b4c2
fix: replaced atyp display and text woff2 with ttf
yougotwill May 31, 2024
0106f92
fix: preivous regular font weight was resolved incorrectly
yougotwill May 31, 2024
1d33605
fix: moved initial styling of body to tailwind
yougotwill May 31, 2024
7859262
fix: update body font to match previous styling
yougotwill May 31, 2024
8d0930e
Merge branch 'main' into fix/no-ref/font_fix
yougotwill May 31, 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
2 changes: 1 addition & 1 deletion app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
lang="en"
className={`${AtypDisplay.variable} ${AtypText.variable} ${MonumentExtended.variable}`}
>
<body className={'text-text'}>{children}</body>
<body>{children}</body>
</html>
);
}
2 changes: 0 additions & 2 deletions components/Button/ScrollButton.module.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
opacity: 0.7

span
font-size: 14px
font-weight: bold
text-transform: uppercase

div
Expand Down
2 changes: 1 addition & 1 deletion components/Button/ScrollButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function ScrollButton() {
return (
<div className={s.MobileScroll} onClick={nudgeDown}>
<div className={s.ScrollIcon} />
<span>Scrolls</span>
<span>Scroll</span>
</div>
);
}
4 changes: 2 additions & 2 deletions components/FlexibleContent/Modules/FaqsList/FaqsList.module.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
padding-bottom: 3px

strong
font-weight: 900
text-transform: uppercase
font-family: var(--font-atyp-display)
font-weight: 700

.Categories > li
scroll-margin-top: 90px
Expand Down Expand Up @@ -91,4 +91,4 @@
display: block

legend
display: none
display: none
2 changes: 1 addition & 1 deletion components/FlexibleContent/Modules/Hero/Hero.module.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ $paddingTop: 78px
p
font-size: 39px
font-family: var(--font-atyp-display)
font-weight: 500
line-height: 1.3
color: var(--color-grey-darker)

Expand Down Expand Up @@ -99,7 +100,6 @@ $paddingTop: 78px
background: linear-gradient(to left, var(--color-black), rgba(0,0,0,0))
right: -2px


img
width: auto
max-width: none
Expand Down
2 changes: 1 addition & 1 deletion components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export function Header() {
'lg:bg-transparent lg:flex-row lg:items-center lg:px-0',
'transform transition-all duration-300',
isExpanded
? 'h-screen translate-y-0 -mb-20 pt-3 pb-10'
? 'h-dvh translate-y-0 -mb-20 pt-3 pb-10'
: 'h-0 -translate-y-full lg:h-auto lg:translate-y-0'
)}
>
Expand Down
4 changes: 0 additions & 4 deletions components/Modal/Modal.module.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@
path
fill: white





@media(max-width: 1024px)

.modal
Expand Down
7 changes: 6 additions & 1 deletion components/Spacer/Spacer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import clsx from 'clsx';
type SpacerProps = {
/** 4px | 8px | 16px | 24px | 48px | 64px | 96px | 128px */
size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl';
inline?: boolean;
className?: string;
};

export const Spacer = (props: SpacerProps) => {
const { size = 'md', className } = props;
const { size = 'md', inline, className } = props;
const sizeClasses = [
size === 'xs' && 'm-0.5',
size === 'sm' && 'm-1',
Expand All @@ -19,5 +20,9 @@ export const Spacer = (props: SpacerProps) => {
size === '4xl' && 'm-20',
];

if (inline) {
return <span className={clsx(sizeClasses, className)} />;
}

return <div className={clsx(sizeClasses, className)} />;
};
93 changes: 0 additions & 93 deletions public/assets/fonts/PublicSans/OFL.txt
View file
Open in desktop

This file was deleted.

Binary file removed public/assets/fonts/PublicSans/PublicSans-Italic-VariableFont_wght.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/PublicSans-VariableFont_wght.ttf
View file
Open in desktop
Binary file not shown.
81 changes: 0 additions & 81 deletions public/assets/fonts/PublicSans/README.txt
View file
Open in desktop

This file was deleted.

Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Black.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-BlackItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-BoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-ExtraBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-ExtraBoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-ExtraLight.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-ExtraLightItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-LightItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-MediumItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-SemiBoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-Thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/PublicSans/static/PublicSans-ThinItalic.ttf
View file
Open in desktop
Binary file not shown.
93 changes: 0 additions & 93 deletions public/assets/fonts/SpaceMono/OFL.txt
View file
Open in desktop

This file was deleted.

Binary file removed public/assets/fonts/SpaceMono/SpaceMono-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/SpaceMono/SpaceMono-Italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed public/assets/fonts/SpaceMono/SpaceMono-Regular.ttf
View file
Open in desktop
Binary file not shown.
Loading