diff --git a/content/hypno/colors/colors.css b/content/hypno/colors/colors.css index c3ba9b0..2c59bd3 100644 --- a/content/hypno/colors/colors.css +++ b/content/hypno/colors/colors.css @@ -1,6 +1,6 @@ #word { font-size: 80px; - font-family: sans-serif; + font-family: 'Raleway'; font-weight: bold; width: 100%; text-align: center; diff --git a/content/hypno/loading/loading.css b/content/hypno/loading/loading.css index 4d17b15..d8dfee9 100644 --- a/content/hypno/loading/loading.css +++ b/content/hypno/loading/loading.css @@ -1,8 +1,3 @@ -@font-face { - font-family: 'Raleway'; - src: url('../fonts/Raleway-Regular.otf'); -} - body { background-color: black; color: red; diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..b6db639 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -euxf -o pipefail + +hugo --cleanDestinationDir +rsync -avz --delete public/ xs:mindjack.xeno.science/ diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 839956d..5f423aa 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -6,7 +6,6 @@ {{ block "title" . }}{{ .Site.Title }}{{ end }} - {{ block "styles" . }}{{ end }} diff --git a/static/css/base.css b/static/css/base.css index 28a9b37..f4dbae7 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -1,6 +1,15 @@ @font-face { font-family: 'Raleway'; - src: url('/fonts/Raleway-Regular.otf'); + src: url('/fonts/Raleway-VF.woff2'); + font-weight: 100 900; + font-style: normal; +} + +@font-face { + font-family: 'Raleway'; + src: url('/fonts/Raleway-Italic-VF.woff2'); + font-weight: 100 900; + font-style: italic; } body { diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..02353d3 Binary files /dev/null and b/static/favicon.ico differ diff --git a/static/fonts/Raleway-Italic-VF.woff2 b/static/fonts/Raleway-Italic-VF.woff2 new file mode 100644 index 0000000..e5aab34 Binary files /dev/null and b/static/fonts/Raleway-Italic-VF.woff2 differ diff --git a/static/fonts/Raleway-LICENSE b/static/fonts/Raleway-LICENSE.md similarity index 67% rename from static/fonts/Raleway-LICENSE rename to static/fonts/Raleway-LICENSE.md index 3219811..083a678 100644 --- a/static/fonts/Raleway-LICENSE +++ b/static/fonts/Raleway-LICENSE.md @@ -1,95 +1,116 @@ -Copyright (c) 2010, Matt McInerney (matt@pixelspread.com), -Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com), -Copyright (c) 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Raleway - -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. + Copyright (c) 2010-2013, Matt McInerney , + with Reserved Font Name: "Raleway". + + Copyright (c) 2012-2013, Pablo Impallari + Copyright (c) 2012-2013, Rodrigo Fuenzalida + + Copyright (c) 2016, Alexei Vanyashin + Copyright (c) 2016, Ivan Petrov + Copyright (c) 2016, Nhung Nguyen + + Copyright (c) 2020, Caleb Maclennan + + 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 + + Version 1.1 - 26 February 2007 + +---- + +SIL Open Font License +===================== + + +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/Raleway-Regular.otf b/static/fonts/Raleway-Regular.otf deleted file mode 100644 index 6abf798..0000000 Binary files a/static/fonts/Raleway-Regular.otf and /dev/null differ diff --git a/static/fonts/Raleway-VF.woff2 b/static/fonts/Raleway-VF.woff2 new file mode 100644 index 0000000..a39cdce Binary files /dev/null and b/static/fonts/Raleway-VF.woff2 differ diff --git a/static/fonts/SansForgetica-LICENSE b/static/fonts/SansForgetica-LICENSE deleted file mode 100644 index f86e992..0000000 --- a/static/fonts/SansForgetica-LICENSE +++ /dev/null @@ -1 +0,0 @@ -Sans Forgetica is Copyright (c) 2018 RMIT University, and is released under a CC-BY-NC license (https://creativecommons.org/licenses/by-nc/4.0/) at https://sansforgetica.rmit/. diff --git a/static/fonts/SansForgetica-Regular.otf b/static/fonts/SansForgetica-Regular.otf deleted file mode 100644 index 27deedb..0000000 Binary files a/static/fonts/SansForgetica-Regular.otf and /dev/null differ