diff --git a/src/components/molecules/PageTitle.svelte b/src/components/molecules/PageTitle.svelte index b978271..982e422 100644 --- a/src/components/molecules/PageTitle.svelte +++ b/src/components/molecules/PageTitle.svelte @@ -1,13 +1,33 @@
{#if secondaryTitle} -
{secondaryTitle}
+
+ {secondaryTitle} +
{/if} -

{title}

+

{title}

diff --git a/src/components/organisms/Header.svelte b/src/components/organisms/Header.svelte index 284059e..14d1678 100644 --- a/src/components/organisms/Header.svelte +++ b/src/components/organisms/Header.svelte @@ -1,28 +1,13 @@
- + diff --git a/src/global.scss b/src/global.scss index e4e49c3..fb59771 100644 --- a/src/global.scss +++ b/src/global.scss @@ -16,7 +16,6 @@ src: local(""), url("/fonts/GradientVector/GradientVector.otf"); } - @font-face { font-family: "Manifold"; font-style: normal; @@ -24,7 +23,6 @@ src: local(""), url("/fonts/Manifold/manifold.otf"), url("/fonts/Manifold/manifold.ttf"); } - @font-face { font-family: "3270"; font-style: normal; @@ -32,14 +30,6 @@ src: local(""), url("/fonts/3270/3270SemiCondensed-Regular.otf"), url("/fonts/3270/3270SemiCondensed-Regular.ttf"); } - - @font-face { - font-family: "Sixtyfour"; - font-style: normal; - font-weight: 300; - src: local(""), url("/fonts/Sixtyfour/Sixtyfour[wdth,wght].ttf"), url("/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff"), url("/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff2"); - } - :root { --color-background: #2B1C3D; --color-background-light: #3A2A4D; @@ -58,7 +48,7 @@ --font-primary: Manifold, Lexend, Arial, Helvetica, sans-serif; --font-readable: "3270", Lexend, Arial, Helvetica, sans-serif; - --font-page-title: Sixtyfour, Manifold, Lexend, Arial, Helvetica, sans-serif; + --font-page-title: GradientVector, Manifold, Lexend, Arial, Helvetica, sans-serif; } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6b40c43..3ead630 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -32,6 +32,7 @@ .footer-position { margin: 0; width: 100%; + padding-top: 1em; margin-top: auto; } } diff --git a/static/fonts/Sixtyfour/LICENSE.txt b/static/fonts/Sixtyfour/LICENSE.txt deleted file mode 100644 index 5506d14..0000000 --- a/static/fonts/Sixtyfour/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2019, Jens Kutilek (www.kutilek.de), - -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/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].ttf b/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].ttf deleted file mode 100644 index 24209d2..0000000 Binary files a/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].ttf and /dev/null differ diff --git a/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff b/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff deleted file mode 100644 index 207fee3..0000000 Binary files a/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff and /dev/null differ diff --git a/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff2 b/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff2 deleted file mode 100644 index 1a2ab78..0000000 Binary files a/static/fonts/Sixtyfour/Sixtyfour[wdth,wght].woff2 and /dev/null differ