From 68cd2b957599b3794106aea37f5446d8e9c846e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20B=C3=BClow?= Date: Sun, 29 Jan 2023 19:12:57 +0100 Subject: [PATCH] updated to latest version of Hugo Theme --- Makefile | 6 +- content/impressum.md | 1 + content/licences/nerd-fonts.md | 129 +++++++++++++++++++++++++++++++++ themes/hugo-theme-terminal | 2 +- themes/jmbit-footer.diff | 21 ++++++ 5 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 content/licences/nerd-fonts.md create mode 100644 themes/jmbit-footer.diff diff --git a/Makefile b/Makefile index 9eb1564..94df779 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ HEAD=$(shell git rev-parse --short HEAD) dev: hugo server -D -static: +hugo: hugo container: podman build -t docker.io/jmbitci/www-jmbit-de:latest . @@ -9,7 +9,7 @@ container: publish: podman push docker.io/jmbitci/www-jmbit-de:latest podman push docker.io/jmbitci/www-jmbit-de:$(HEAD) -nopub: static container +nopub: hugo container podman run --rm -p8080:80 docker.io/jmbitci/www-jmbit-de rollout: @@ -18,6 +18,6 @@ rollout: clean: rm -all: static container publish +all: hugo container publish diff --git a/content/impressum.md b/content/impressum.md index 9b72e10..362f9f9 100644 --- a/content/impressum.md +++ b/content/impressum.md @@ -3,6 +3,7 @@ title: "Impressum" draft: false --- + Angaben gemäß § 5 TMG Johannes Bülow diff --git a/content/licences/nerd-fonts.md b/content/licences/nerd-fonts.md new file mode 100644 index 0000000..739c911 --- /dev/null +++ b/content/licences/nerd-fonts.md @@ -0,0 +1,129 @@ +--- +title: "Nerd Fonts Licensing" +draft: true +--- + +There are various sources used under various licenses: + +* Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files are licensed under SIL OPEN FONT LICENSE Version 1.1 (see below). +* Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others) are licensed under the MIT License (MIT) (see below). +* Many other licenses are present in this project for even more detailed breakdown see: [License Audit](https://github.com/ryanoasis/nerd-fonts/blob/-/license-audit.md). + +## Source files not in folders containing an explicit license are using the MIT License (MIT) + +The MIT License (MIT) + +Copyright (c) 2014 Ryan L McIntyre + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +## Various Fonts, Patched Fonts, SVGs, Glyph Fonts, and any files in a folder with explicit SIL OFL 1.1 License + +Copyright (c) 2014, Ryan L McIntyre (https://ryanlmcintyre.com). + +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/themes/hugo-theme-terminal b/themes/hugo-theme-terminal index b931e14..2b14b3d 160000 --- a/themes/hugo-theme-terminal +++ b/themes/hugo-theme-terminal @@ -1 +1 @@ -Subproject commit b931e14ece7fa90ef64002cecda0f5cdeb6cc41d +Subproject commit 2b14b3d4e5eab53aa45647490bb797b642a82a59 diff --git a/themes/jmbit-footer.diff b/themes/jmbit-footer.diff new file mode 100644 index 0000000..d05c6bb --- /dev/null +++ b/themes/jmbit-footer.diff @@ -0,0 +1,21 @@ +diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html +index 856ddde..fe25e1a 100644 +--- a/layouts/partials/footer.html ++++ b/layouts/partials/footer.html +@@ -1,9 +1,13 @@ +