diff --git a/app.vue b/app.vue index 760ceac..4f32210 100644 --- a/app.vue +++ b/app.vue @@ -13,9 +13,10 @@ import 'virtual:svg-icons-register' const { assignVhCssVariable } = useViewportSizes() -const assignVhCssVariableDebounced = debounce(assignVhCssVariable, 300) +const assignVhCssVariableDebounced = debounce(assignVhCssVariable, 200) onMounted(() => { + assignVhCssVariable() window.addEventListener('resize', assignVhCssVariableDebounced) }) diff --git a/assets/styles/_global.scss b/assets/styles/_global.scss index 13ce41e..1bd597f 100644 --- a/assets/styles/_global.scss +++ b/assets/styles/_global.scss @@ -107,17 +107,17 @@ main { } h1 { - font-family: var(--app-font-family-main); + font-family: var(--app-font-family-secondary); font-size: toRem(56); - font-weight: 500; + font-weight: 400; line-height: toRem(72); letter-spacing: 0; } h2 { - font-family: var(--app-font-family-main); + font-family: var(--app-font-family-secondary); font-size: toRem(40); - font-weight: 500; + font-weight: 400; line-height: toRem(48); letter-spacing: 0; @@ -128,9 +128,9 @@ h2 { } h3 { - font-family: var(--app-font-family-main); + font-family: var(--app-font-family-secondary); font-size: toRem(24); - font-weight: 500; + font-weight: 400; line-height: toRem(32); letter-spacing: 0; diff --git a/assets/styles/_variables.scss b/assets/styles/_variables.scss index 7b533b5..5e48d77 100644 --- a/assets/styles/_variables.scss +++ b/assets/styles/_variables.scss @@ -65,6 +65,7 @@ /* App variables */ --app-txt: #{$text-primary-main}; --app-font-family-main: 'Inter', 'Arial', sans-serif; + --app-font-family-secondary: 'Righteous', 'Arial', sans-serif; --app-padding-right: #{toRem(32)}; --app-padding-left: #{toRem(32)}; --app-padding-top: #{toRem(48)}; diff --git a/components/AppLogo.vue b/components/AppLogo.vue index 3f20f4f..753d21c 100644 --- a/components/AppLogo.vue +++ b/components/AppLogo.vue @@ -28,6 +28,7 @@ const onClick = () => { .app-logo__img { max-width: toRem(32); max-height: toRem(32); + margin-left: toRem(-8); } .app-logo__title { diff --git a/components/StatsPreview.vue b/components/StatsPreview.vue index 6980b12..75d645f 100644 --- a/components/StatsPreview.vue +++ b/components/StatsPreview.vue @@ -21,6 +21,7 @@ background-size: 100% 100%; width: 100%; min-height: vh(100); + transition: min-height var(--field-transition-duration); padding: calc(var(--app-height-header) + var(--app-padding-top)) toRem(80) var(--app-padding-bottom); diff --git a/public/branding/fonts/Inter/LICENSE.txt b/public/branding/fonts/Inter/OFL.txt similarity index 100% rename from public/branding/fonts/Inter/LICENSE.txt rename to public/branding/fonts/Inter/OFL.txt diff --git a/public/branding/fonts/Righteous/OFL.txt b/public/branding/fonts/Righteous/OFL.txt new file mode 100644 index 0000000..22f3d20 --- /dev/null +++ b/public/branding/fonts/Righteous/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI) +(astigma@astigmatic.com), with Reserved Font Names "Righteous" + +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/branding/fonts/Righteous/Righteous-Regular.ttf b/public/branding/fonts/Righteous/Righteous-Regular.ttf new file mode 100644 index 0000000..fc9c0a8 Binary files /dev/null and b/public/branding/fonts/Righteous/Righteous-Regular.ttf differ diff --git a/public/branding/fonts/index.css b/public/branding/fonts/index.css index 653554b..0cf5c62 100644 --- a/public/branding/fonts/index.css +++ b/public/branding/fonts/index.css @@ -5,3 +5,11 @@ font-style: normal; font-display: swap; } + +@font-face { + font-family: 'Righteous'; + src: local('Righteous'), url('./Righteous/Righteous-Regular.ttf') format('truetype'); + font-weight: 400; + font-style: normal; + font-display: swap; +}