diff --git a/app/layout.tsx b/app/layout.tsx index f6a84b1..99c66b0 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -11,7 +11,7 @@ export default function RootLayout({ children }: { children: ReactNode }) { lang="en" className={`${AtypDisplay.variable} ${AtypText.variable} ${MonumentExtended.variable}`} > - {children} + {children} ); } diff --git a/components/Button/ScrollButton.module.sass b/components/Button/ScrollButton.module.sass index 2f47cbd..ce434f4 100644 --- a/components/Button/ScrollButton.module.sass +++ b/components/Button/ScrollButton.module.sass @@ -16,8 +16,6 @@ opacity: 0.7 span - font-size: 14px - font-weight: bold text-transform: uppercase div diff --git a/components/Button/ScrollButton.tsx b/components/Button/ScrollButton.tsx index 29a2aaa..2dd07ae 100644 --- a/components/Button/ScrollButton.tsx +++ b/components/Button/ScrollButton.tsx @@ -14,7 +14,7 @@ export default function ScrollButton() { return (
- Scrolls + Scroll
); } diff --git a/components/FlexibleContent/Modules/FaqsList/FaqsList.module.sass b/components/FlexibleContent/Modules/FaqsList/FaqsList.module.sass index 1c2a98c..296faed 100644 --- a/components/FlexibleContent/Modules/FaqsList/FaqsList.module.sass +++ b/components/FlexibleContent/Modules/FaqsList/FaqsList.module.sass @@ -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 @@ -91,4 +91,4 @@ display: block legend - display: none \ No newline at end of file + display: none diff --git a/components/FlexibleContent/Modules/Hero/Hero.module.sass b/components/FlexibleContent/Modules/Hero/Hero.module.sass index 4a6e9b9..3d452b1 100644 --- a/components/FlexibleContent/Modules/Hero/Hero.module.sass +++ b/components/FlexibleContent/Modules/Hero/Hero.module.sass @@ -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) @@ -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 diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index 5eecf6d..beb33dc 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -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' )} > diff --git a/components/Modal/Modal.module.sass b/components/Modal/Modal.module.sass index ec61fe2..af14f2c 100644 --- a/components/Modal/Modal.module.sass +++ b/components/Modal/Modal.module.sass @@ -63,10 +63,6 @@ path fill: white - - - - @media(max-width: 1024px) .modal diff --git a/components/Spacer/Spacer.tsx b/components/Spacer/Spacer.tsx index de5a1da..c06caca 100644 --- a/components/Spacer/Spacer.tsx +++ b/components/Spacer/Spacer.tsx @@ -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', @@ -19,5 +20,9 @@ export const Spacer = (props: SpacerProps) => { size === '4xl' && 'm-20', ]; + if (inline) { + return ; + } + return
; }; diff --git a/public/assets/fonts/PublicSans/OFL.txt b/public/assets/fonts/PublicSans/OFL.txt deleted file mode 100755 index ac793ea..0000000 --- a/public/assets/fonts/PublicSans/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/assets/fonts/PublicSans/PublicSans-Italic-VariableFont_wght.ttf b/public/assets/fonts/PublicSans/PublicSans-Italic-VariableFont_wght.ttf deleted file mode 100755 index 963448d..0000000 Binary files a/public/assets/fonts/PublicSans/PublicSans-Italic-VariableFont_wght.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/PublicSans-VariableFont_wght.ttf b/public/assets/fonts/PublicSans/PublicSans-VariableFont_wght.ttf deleted file mode 100755 index f38172d..0000000 Binary files a/public/assets/fonts/PublicSans/PublicSans-VariableFont_wght.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/README.txt b/public/assets/fonts/PublicSans/README.txt deleted file mode 100755 index bef24d7..0000000 --- a/public/assets/fonts/PublicSans/README.txt +++ /dev/null @@ -1,81 +0,0 @@ -Public Sans Variable Font -========================= - -This download contains Public Sans as both variable fonts and static fonts. - -Public Sans is a variable font with this axis: - wght - -This means all the styles are contained in these files: - PublicSans-VariableFont_wght.ttf - PublicSans-Italic-VariableFont_wght.ttf - -If your app fully supports variable fonts, you can now pick intermediate styles -that aren’t available as static fonts. Not all apps support variable fonts, and -in those cases you can use the static font files for Public Sans: - static/PublicSans-Thin.ttf - static/PublicSans-ExtraLight.ttf - static/PublicSans-Light.ttf - static/PublicSans-Regular.ttf - static/PublicSans-Medium.ttf - static/PublicSans-SemiBold.ttf - static/PublicSans-Bold.ttf - static/PublicSans-ExtraBold.ttf - static/PublicSans-Black.ttf - static/PublicSans-ThinItalic.ttf - static/PublicSans-ExtraLightItalic.ttf - static/PublicSans-LightItalic.ttf - static/PublicSans-Italic.ttf - static/PublicSans-MediumItalic.ttf - static/PublicSans-SemiBoldItalic.ttf - static/PublicSans-BoldItalic.ttf - static/PublicSans-ExtraBoldItalic.ttf - static/PublicSans-BlackItalic.ttf - -Get started ------------ - -1. Install the font files you want to use - -2. Use your app's font picker to view the font family and all the -available styles - -Learn more about variable fonts -------------------------------- - - https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts - https://variablefonts.typenetwork.com - https://medium.com/variable-fonts - -In desktop apps - - https://theblog.adobe.com/can-variable-fonts-illustrator-cc - https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts - -Online - - https://developers.google.com/fonts/docs/getting_started - https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide - https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts - -Installing fonts - - MacOS: https://support.apple.com/en-us/HT201749 - Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux - Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows - -Android Apps - - https://developers.google.com/fonts/docs/android - https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts - -License -------- -Please read the full license text (OFL.txt) to understand the permissions, -restrictions and requirements for usage, redistribution, and modification. - -You can use them freely in your products & projects - print or digital, -commercial or otherwise. However, you can't sell the fonts on their own. - -This isn't legal advice, please consider consulting a lawyer and see the full -license for all details. diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Black.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Black.ttf deleted file mode 100755 index af8b039..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Black.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-BlackItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-BlackItalic.ttf deleted file mode 100755 index eeb60f0..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-BlackItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Bold.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Bold.ttf deleted file mode 100755 index 3eb5ac2..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Bold.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-BoldItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-BoldItalic.ttf deleted file mode 100755 index 8a1d925..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-BoldItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-ExtraBold.ttf b/public/assets/fonts/PublicSans/static/PublicSans-ExtraBold.ttf deleted file mode 100755 index 5409113..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-ExtraBold.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-ExtraBoldItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-ExtraBoldItalic.ttf deleted file mode 100755 index c0f88c3..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-ExtraBoldItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-ExtraLight.ttf b/public/assets/fonts/PublicSans/static/PublicSans-ExtraLight.ttf deleted file mode 100755 index 1832c90..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-ExtraLight.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-ExtraLightItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-ExtraLightItalic.ttf deleted file mode 100755 index 0900749..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-ExtraLightItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Italic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Italic.ttf deleted file mode 100755 index 1f702a8..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Italic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Light.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Light.ttf deleted file mode 100755 index 13fd7ed..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Light.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-LightItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-LightItalic.ttf deleted file mode 100755 index 57be414..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-LightItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Medium.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Medium.ttf deleted file mode 100755 index 05f435f..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Medium.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-MediumItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-MediumItalic.ttf deleted file mode 100755 index 607be40..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-MediumItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Regular.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Regular.ttf deleted file mode 100755 index 25c1646..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Regular.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-SemiBold.ttf b/public/assets/fonts/PublicSans/static/PublicSans-SemiBold.ttf deleted file mode 100755 index 0ffc284..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-SemiBold.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-SemiBoldItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-SemiBoldItalic.ttf deleted file mode 100755 index 9b107be..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-SemiBoldItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-Thin.ttf b/public/assets/fonts/PublicSans/static/PublicSans-Thin.ttf deleted file mode 100755 index 3cc73b9..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-Thin.ttf and /dev/null differ diff --git a/public/assets/fonts/PublicSans/static/PublicSans-ThinItalic.ttf b/public/assets/fonts/PublicSans/static/PublicSans-ThinItalic.ttf deleted file mode 100755 index 10e2521..0000000 Binary files a/public/assets/fonts/PublicSans/static/PublicSans-ThinItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/SpaceMono/OFL.txt b/public/assets/fonts/SpaceMono/OFL.txt deleted file mode 100755 index 8109b54..0000000 --- a/public/assets/fonts/SpaceMono/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2016 Google Inc. All Rights Reserved. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/assets/fonts/SpaceMono/SpaceMono-Bold.ttf b/public/assets/fonts/SpaceMono/SpaceMono-Bold.ttf deleted file mode 100755 index 18b8aea..0000000 Binary files a/public/assets/fonts/SpaceMono/SpaceMono-Bold.ttf and /dev/null differ diff --git a/public/assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf b/public/assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf deleted file mode 100755 index 51fcc39..0000000 Binary files a/public/assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/SpaceMono/SpaceMono-Italic.ttf b/public/assets/fonts/SpaceMono/SpaceMono-Italic.ttf deleted file mode 100755 index 119c545..0000000 Binary files a/public/assets/fonts/SpaceMono/SpaceMono-Italic.ttf and /dev/null differ diff --git a/public/assets/fonts/SpaceMono/SpaceMono-Regular.ttf b/public/assets/fonts/SpaceMono/SpaceMono-Regular.ttf deleted file mode 100755 index 3374aca..0000000 Binary files a/public/assets/fonts/SpaceMono/SpaceMono-Regular.ttf and /dev/null differ diff --git a/styles/Global.sass b/styles/Global.sass index 5566727..49d99eb 100644 --- a/styles/Global.sass +++ b/styles/Global.sass @@ -9,16 +9,9 @@ --spacer: 230px -body - font-family: var(--font-atyp-text) - font-size: 18px - font-weight: 400 - background: var(--color-black) - color: white - h1, .h1, h2, .h2, h3, .h3, h4, .h4 font-family: var(--font-atyp-display) - font-weight: 400 + font-weight: 500 line-height: 1.3 &.HasGradient @@ -70,6 +63,7 @@ strong, b .smallTitle font-family: var(--font-atyp-display) + font-weight: 500 font-size: 14px text-transform: uppercase diff --git a/styles/Reset.sass b/styles/Reset.sass index d40e1e4..6357e11 100644 --- a/styles/Reset.sass +++ b/styles/Reset.sass @@ -47,29 +47,20 @@ meter *, *::before, *::after * - margin: 0 - -html, body - height: 100% - outline: none - max-width: 100vw - -body - line-height: 1.5 - -webkit-font-smoothing: antialiased + margin: 0 img, picture, video, canvas, svg - display: block - max-width: 100% + display: block + max-width: 100% input, button, textarea, select - font: inherit + font: inherit button - cursor: pointer + cursor: pointer p, h1, h2, h3, h4, h5, h6 - overflow-wrap: break-word + overflow-wrap: break-word #root, #__next - isolation: isolate + isolation: isolate diff --git a/styles/fonts/AtypDisplay-Medium.woff2 b/styles/fonts/AtypDisplay-Medium.woff2 deleted file mode 100644 index cdf1cc5..0000000 Binary files a/styles/fonts/AtypDisplay-Medium.woff2 and /dev/null differ diff --git a/styles/fonts/AtypDisplay-MediumItalic.woff2 b/styles/fonts/AtypDisplay-MediumItalic.woff2 deleted file mode 100644 index b0f0260..0000000 Binary files a/styles/fonts/AtypDisplay-MediumItalic.woff2 and /dev/null differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Bold.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Bold.ttf new file mode 100644 index 0000000..d45ef95 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Bold.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-BoldItalic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-BoldItalic.ttf new file mode 100644 index 0000000..8811dd0 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-BoldItalic.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Italic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Italic.ttf new file mode 100644 index 0000000..65f982f Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Italic.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Light.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Light.ttf new file mode 100644 index 0000000..83c0485 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Light.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-LightItalic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-LightItalic.ttf new file mode 100644 index 0000000..5c77300 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-LightItalic.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Medium.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Medium.ttf new file mode 100644 index 0000000..f35846c Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Medium.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-MediumItalic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-MediumItalic.ttf new file mode 100644 index 0000000..ad849c5 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-MediumItalic.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Regular.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Regular.ttf new file mode 100644 index 0000000..501cd45 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Regular.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Semibold.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Semibold.ttf new file mode 100644 index 0000000..663cc08 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Semibold.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-SemiboldItalic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-SemiboldItalic.ttf new file mode 100644 index 0000000..da02e20 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-SemiboldItalic.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-Thin.ttf b/styles/fonts/AtypDisplay/AtypDisplay-Thin.ttf new file mode 100644 index 0000000..a8fe676 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-Thin.ttf differ diff --git a/styles/fonts/AtypDisplay/AtypDisplay-ThinItalic.ttf b/styles/fonts/AtypDisplay/AtypDisplay-ThinItalic.ttf new file mode 100644 index 0000000..9d52819 Binary files /dev/null and b/styles/fonts/AtypDisplay/AtypDisplay-ThinItalic.ttf differ diff --git a/styles/fonts/AtypText-Italic.woff2 b/styles/fonts/AtypText-Italic.woff2 deleted file mode 100644 index 93a190d..0000000 Binary files a/styles/fonts/AtypText-Italic.woff2 and /dev/null differ diff --git a/styles/fonts/AtypText-Regular.woff2 b/styles/fonts/AtypText-Regular.woff2 deleted file mode 100644 index cca7fba..0000000 Binary files a/styles/fonts/AtypText-Regular.woff2 and /dev/null differ diff --git a/styles/fonts/AtypText/AtypText-Bold.ttf b/styles/fonts/AtypText/AtypText-Bold.ttf new file mode 100755 index 0000000..3cdb867 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Bold.ttf differ diff --git a/styles/fonts/AtypText/AtypText-BoldItalic.ttf b/styles/fonts/AtypText/AtypText-BoldItalic.ttf new file mode 100755 index 0000000..9deb81d Binary files /dev/null and b/styles/fonts/AtypText/AtypText-BoldItalic.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Italic.ttf b/styles/fonts/AtypText/AtypText-Italic.ttf new file mode 100755 index 0000000..530e0a3 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Italic.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Light.ttf b/styles/fonts/AtypText/AtypText-Light.ttf new file mode 100755 index 0000000..dc0557f Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Light.ttf differ diff --git a/styles/fonts/AtypText/AtypText-LightItalic.ttf b/styles/fonts/AtypText/AtypText-LightItalic.ttf new file mode 100755 index 0000000..4c38d6a Binary files /dev/null and b/styles/fonts/AtypText/AtypText-LightItalic.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Medium.ttf b/styles/fonts/AtypText/AtypText-Medium.ttf new file mode 100755 index 0000000..927b2a8 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Medium.ttf differ diff --git a/styles/fonts/AtypText/AtypText-MediumItalic.ttf b/styles/fonts/AtypText/AtypText-MediumItalic.ttf new file mode 100755 index 0000000..e32cbba Binary files /dev/null and b/styles/fonts/AtypText/AtypText-MediumItalic.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Regular.ttf b/styles/fonts/AtypText/AtypText-Regular.ttf new file mode 100755 index 0000000..4eabbaf Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Regular.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Semibold.ttf b/styles/fonts/AtypText/AtypText-Semibold.ttf new file mode 100755 index 0000000..10b0311 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Semibold.ttf differ diff --git a/styles/fonts/AtypText/AtypText-SemiboldItalic.ttf b/styles/fonts/AtypText/AtypText-SemiboldItalic.ttf new file mode 100755 index 0000000..8a97b24 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-SemiboldItalic.ttf differ diff --git a/styles/fonts/AtypText/AtypText-Thin.ttf b/styles/fonts/AtypText/AtypText-Thin.ttf new file mode 100755 index 0000000..b269f9b Binary files /dev/null and b/styles/fonts/AtypText/AtypText-Thin.ttf differ diff --git a/styles/fonts/AtypText/AtypText-ThinItalic.ttf b/styles/fonts/AtypText/AtypText-ThinItalic.ttf new file mode 100755 index 0000000..5dd5f86 Binary files /dev/null and b/styles/fonts/AtypText/AtypText-ThinItalic.ttf differ diff --git a/styles/fonts/MonumentExtended-Regular.woff2 b/styles/fonts/MonumentExtended/MonumentExtended-Regular.woff2 similarity index 100% rename from styles/fonts/MonumentExtended-Regular.woff2 rename to styles/fonts/MonumentExtended/MonumentExtended-Regular.woff2 diff --git a/styles/fonts/fonts.ts b/styles/fonts/fonts.ts index 9c8941b..4415c4f 100644 --- a/styles/fonts/fonts.ts +++ b/styles/fonts/fonts.ts @@ -3,11 +3,57 @@ import localFont from 'next/font/local'; const AtypDisplay = localFont({ src: [ { - path: '/AtypDisplay-Medium.woff2', - style: 'normal', + path: './AtypDisplay/AtypDisplay-Thin.ttf', + weight: '100', }, { - path: '/AtypDisplay-MediumItalic.woff2', + path: './AtypDisplay/AtypDisplay-Light.ttf', + weight: '300', + }, + { + path: './AtypDisplay/AtypDisplay-Regular.ttf', + weight: '400', + }, + { + path: './AtypDisplay/AtypDisplay-Medium.ttf', + weight: '500', + }, + { + path: './AtypDisplay/AtypDisplay-SemiBold.ttf', + weight: '600', + }, + { + path: './AtypDisplay/AtypDisplay-Bold.ttf', + weight: '700', + }, + { + path: './AtypDisplay/AtypDisplay-ThinItalic.ttf', + weight: '100', + style: 'italic', + }, + { + path: './AtypDisplay/AtypDisplay-LightItalic.ttf', + weight: '300', + style: 'italic', + }, + { + path: './AtypDisplay/AtypDisplay-Italic.ttf', + weight: '400', + style: 'italic', + }, + { + path: './AtypDisplay/AtypDisplay-MediumItalic.ttf', + weight: '500', + style: 'italic', + }, + { + path: './AtypDisplay/AtypDisplay-SemiBoldItalic.ttf', + weight: '600', + style: 'italic', + }, + { + path: './AtypDisplay/AtypDisplay-BoldItalic.ttf', + weight: '700', style: 'italic', }, ], @@ -18,11 +64,57 @@ const AtypDisplay = localFont({ const AtypText = localFont({ src: [ { - path: '/AtypText-Regular.woff2', - style: 'normal', + path: './AtypText/AtypText-Thin.ttf', + weight: '100', + }, + { + path: './AtypText/AtypText-Light.ttf', + weight: '300', + }, + { + path: './AtypText/AtypText-Regular.ttf', + weight: '400', + }, + { + path: './AtypText/AtypText-Medium.ttf', + weight: '500', + }, + { + path: './AtypText/AtypText-SemiBold.ttf', + weight: '600', + }, + { + path: './AtypText/AtypText-Bold.ttf', + weight: '700', + }, + { + path: './AtypText/AtypText-ThinItalic.ttf', + weight: '100', + style: 'italic', + }, + { + path: './AtypText/AtypText-LightItalic.ttf', + weight: '300', + style: 'italic', + }, + { + path: './AtypText/AtypText-Italic.ttf', + weight: '400', + style: 'italic', + }, + { + path: './AtypText/AtypText-MediumItalic.ttf', + weight: '500', + style: 'italic', + }, + { + path: './AtypText/AtypText-SemiBoldItalic.ttf', + weight: '600', + style: 'italic', }, { - path: '/AtypText-Italic.woff2', + path: './AtypText/AtypText-BoldItalic.ttf', + weight: '700', style: 'italic', }, ], @@ -33,7 +125,7 @@ const AtypText = localFont({ const MonumentExtended = localFont({ src: [ { - path: '/MonumentExtended-Regular.woff2', + path: './MonumentExtended/MonumentExtended-Regular.woff2', }, ], variable: '--font-monument-extended', diff --git a/styles/globals.css b/styles/globals.css index 100cdec..5a135fa 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -14,8 +14,6 @@ --black: #0a0a0a; --text: #dbdbdb; - - --text-static: #dbdbdb; --text-gradient: linear-gradient(128.42deg, #ffffff -38.86%, #97a99e 133.98%); --text-gradient-darker: linear-gradient( 90.71deg, @@ -26,7 +24,7 @@ --text-caption: linear-gradient(113.07deg, #ace2d5 -6.36%, #405e56 210.93%); --background: var(--black); - --foreground: var(--gray-light); + --foreground: var(--text); } } @@ -56,15 +54,16 @@ @layer base { body { - @apply bg-background text-foreground overflow-x-hidden; - } -} + /* TODO this make fonts slightly thinner and lighter in Firefox compared to figma */ + /* @apply antialiased; */ + /* TODO Do we need the height, outline and width on html as well? */ + @apply h-full outline-none w-screen overflow-x-hidden; + @apply font-atyp-text font-normal text-lg leading-6 bg-background text-foreground; -body { - /* Fix for Safari */ - /* https://stackoverflow.com/a/37365794 */ - font-weight: 400; - text-rendering: optimizeLegibility; + /* Fix for Safari */ + /* https://stackoverflow.com/a/37365794 */ + text-rendering: optimizeLegibility; + } } a, diff --git a/tailwind.config.ts b/tailwind.config.ts index 99351d7..0488efb 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -12,7 +12,8 @@ export default { mode: 'jit', theme: { fontFamily: { - helvetica: ['Helvetica', 'Arial', 'sans-serif'], + 'atyp-display': ['var(--font-atyp-display)'], + 'atyp-text': ['var(--font-atyp-text)'], }, screens: { sm: '375px', @@ -23,10 +24,6 @@ export default { '3xl': '1920px', }, extend: { - fontFamily: { - 'atyp-display': ['var(--font-atyp-display)'], - 'atyp-text': ['var(--font-atyp-text)'], - }, animation: { push: 'push 0.3s linear 1', }, @@ -41,7 +38,7 @@ export default { background: 'var(--background)', foreground: 'var(--foreground)', text: { - DEFAULT: 'var(--text-static)', + DEFAULT: 'var(--text-text)', gradient: 'var(--text-gradient)', caption: 'var(--text-caption)', },