From 359ae70a8c065074ea303481f5d6f08e0e0bf8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Tue, 26 Oct 2021 14:36:24 +0200 Subject: [PATCH] Slightly better print version --- _includes/downloads.njk | 2 +- _includes/event-day.njk | 2 +- build.sh | 2 +- downloads.css | 17 ++++++++++++++--- events.css | 13 +++++++++++++ img/download.svg | 5 ----- img/pdf.svg | 10 ++++++++++ img/web.svg | 10 ++++++++++ impressum/index.yml | 36 ++++++++++++++++++++++++++++++++++++ 9 files changed, 86 insertions(+), 11 deletions(-) delete mode 100644 img/download.svg create mode 100644 img/pdf.svg create mode 100644 img/web.svg diff --git a/_includes/downloads.njk b/_includes/downloads.njk index 3251863..4ce8225 100644 --- a/_includes/downloads.njk +++ b/_includes/downloads.njk @@ -10,7 +10,7 @@ >PDF Web {% endfor %} diff --git a/_includes/event-day.njk b/_includes/event-day.njk index fdddec1..3cfdc24 100644 --- a/_includes/event-day.njk +++ b/_includes/event-day.njk @@ -1,4 +1,4 @@ -
+
{{ eventDay.heading }} diff --git a/build.sh b/build.sh index ce6737f..df5f3db 100755 --- a/build.sh +++ b/build.sh @@ -4,5 +4,5 @@ lume cp -r ./img ./_site/ cp -r ./unterricht/docs ./_site/unterricht/ cp -r ./fonts ./_site/ -cp -r ./videos ./_site/ +# cp -r ./videos ./_site/ cp favicon.png ./_site/ diff --git a/downloads.css b/downloads.css index 9da721a..d77f5c6 100644 --- a/downloads.css +++ b/downloads.css @@ -2,6 +2,7 @@ display: flex; align-items: flex-start; justify-self: start; + line-height: 120%; } @media print { @@ -59,9 +60,11 @@ display: flex; flex-wrap: wrap; color: var(--primary-font); + position: relative; } .download-name { + font-size: 1.2rem; flex-basis: 100%; } @@ -82,14 +85,22 @@ background-color: rgba(0, 0, 0, 0.2); } -.download-link_pdf::before { +.download-link::before { content: ''; - background-image: url(/img/download.svg); background-repeat: no-repeat; background-size: 18px; display: block; - margin-right: 18px; + margin-right: 12px; flex-basis: 22px; flex-shrink: 0; height: 18px; + color: white; +} + +.download-link_pdf::before { + background-image: url(/img/pdf.svg); +} + +.download-link_web::before { + background-image: url(/img/web.svg); } diff --git a/events.css b/events.css index eb96f38..243ec04 100644 --- a/events.css +++ b/events.css @@ -4,6 +4,7 @@ position: relative; margin-right: calc(-1 * (100vw - 2 * var(--side-padding))); max-width: calc( 100vw - 2 * var(--side-padding)); + display: block; } .event-day[open] { @@ -17,12 +18,24 @@ cursor: pointer; } +@media print { + .event-day-heading { + display: block; + } +} + .event { border-top: 3px solid var(--border); margin-left: 20px; padding-bottom: 32px; display: flex; flex-direction: column; + break-before: always; + page-break-before: always; + break-inside: avoid; + page-break-inside: avoid; + break-after: always; + page-break-after: always; } @media screen and (min-width: 1024px) { diff --git a/img/download.svg b/img/download.svg deleted file mode 100644 index 8a68366..0000000 --- a/img/download.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/img/pdf.svg b/img/pdf.svg new file mode 100644 index 0000000..7a7c9e9 --- /dev/null +++ b/img/pdf.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/img/web.svg b/img/web.svg new file mode 100644 index 0000000..b97e665 --- /dev/null +++ b/img/web.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/impressum/index.yml b/impressum/index.yml index 718b090..47d7e5d 100644 --- a/impressum/index.yml +++ b/impressum/index.yml @@ -157,4 +157,40 @@ Soweit in der Internetpräsenz der Stadt Köln ein Zugang zu fremden Inhalten, e Für illegale, fehlerhafte oder unvollständige Inhalte und insbesondere Schäden, die aus der Nutzung oder Nichtnutzung von Informationen Dritter entstehen, haftet allein der Anbieter der Seite, auf welche verwiesen wurde, nicht derjenige, der über Links auf die jeweilige Veröffentlichung lediglich verweist. + + +### Lizenzen dritter + +Auf dieser Seite werden Icons benutzt die unter der MIT Lizenz zur verfügung stehen. + +
+ Lizenzvereinbarung + +MIT License + + +Copyright (c) 2020 Paweł Kuna + + +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. + +
'