diff --git a/assets/sass/anchorlink.scss b/assets/sass/anchorlink.scss index eaba6ae5..3bdd4123 100644 --- a/assets/sass/anchorlink.scss +++ b/assets/sass/anchorlink.scss @@ -31,7 +31,7 @@ } @media print { - margin: 0; + margin: 1rem 0; } svg { @@ -60,6 +60,10 @@ background-color: var(--bg-neutral); opacity: 1; } + + @media print { + display: none; + } } .a-snackbar { diff --git a/assets/sass/booking.scss b/assets/sass/booking.scss index dc52cab7..fd9e0c06 100644 --- a/assets/sass/booking.scss +++ b/assets/sass/booking.scss @@ -4,7 +4,7 @@ gap: 2rem; width: 100%; - @media (max-width: #{$breakpoint-md}) { + @media screen and (max-width: #{$breakpoint-md}) { display: flex; flex-direction: column; gap: 1rem; @@ -88,6 +88,23 @@ display: flex; gap: 1rem; flex-wrap: wrap; + + @media print { + > a { + flex-wrap: wrap; + font-weight: bold; + + &::after { + font-weight: normal; + } + } + } + > a { + @media print { + flex-wrap: wrap; + font-weight: bold; + } + } } @mixin booking_section($name) { diff --git a/assets/sass/content.scss b/assets/sass/content.scss index a667136c..8be81ec4 100644 --- a/assets/sass/content.scss +++ b/assets/sass/content.scss @@ -13,6 +13,10 @@ code { background-color: var(--bg-accent3); padding: 0.2rem 0.8rem; border-radius: var(--border-radius-s); + + @media print { + padding: 0.2rem 0.6rem; + } } table { @@ -20,6 +24,10 @@ table { margin-bottom: 1rem; margin-left: 0.2rem; box-shadow: 0 0.4rem 0.4rem rgba(0, 0, 0, 0.1); + + @media print { + box-shadow: none; + } } thead { @@ -48,6 +56,10 @@ tbody { tr:last-of-type { border-bottom: 2px solid $link-hovered; + + @media print { + border-bottom: 0.1rem solid #5b5b5b; + } } } diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss index 6e883415..04cd81c4 100644 --- a/assets/sass/expander.scss +++ b/assets/sass/expander.scss @@ -101,7 +101,7 @@ details[open] > .o-expander__summary:not(.o-expander__summary--booking) { } .details-print { - border: solid; + border: 0.2rem solid #bbb; page-break-inside: avoid; display: block; } diff --git a/assets/sass/footer.scss b/assets/sass/footer.scss index 52fd1d87..aa523b09 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -4,11 +4,19 @@ display: flex; flex-direction: column; gap: 0.8rem; + + @media print { + margin-bottom: 0; + } } .o-footer__links { display: flex; flex-wrap: wrap; + + @media print { + display: none; + } } .o-footer__link { @@ -41,4 +49,14 @@ #language-switcher-button { padding-left: 0; + + @media print { + display: none; + } +} + +.footnote-backref { + @media print { + display: none; + } } diff --git a/assets/sass/interactiveMap.scss b/assets/sass/interactiveMap.scss index e092f631..5475200a 100644 --- a/assets/sass/interactiveMap.scss +++ b/assets/sass/interactiveMap.scss @@ -23,6 +23,10 @@ flex-direction: column; gap: 0.5rem; z-index: 3; + + @media print { + display: none; + } } .o-interactive-map__country--available { diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 5b829a3d..35954c0b 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -12,7 +12,6 @@ @import "form.scss"; @import "expander.scss"; @import "anchorlink.scss"; -@import "print.scss"; @import "booking.scss"; @import "button.scss"; @import "startpage.scss"; diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 17308c90..062693f4 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -8,6 +8,10 @@ height: 6rem; padding-left: calc((100vw - 100%) / 2); border-bottom: var(--border); + + @media print { + display: none; + } } .o-header__wrapper { diff --git a/assets/sass/print.scss b/assets/sass/print.scss deleted file mode 100644 index 852d98ea..00000000 --- a/assets/sass/print.scss +++ /dev/null @@ -1,48 +0,0 @@ -@media print { - body { - margin: 1.6cm; - } - - a { - text-decoration: none; - color: var(--bs-body-color); - } - - a:not(.m-teaser) { - color: var(--bs-body-color); - } - - p { - margin-bottom: 1rem; - } - - main > .o-container > .o-single, - main > .o-container > .o-list { - margin-top: 0; - } - - .o-single__container, - .o-container { - padding: 0; - } - - .a-anchorlink__link, - picture, - .icon-arrow_outward, - .o-aside, - .o-list__picture, - .o-header__wrapper, - .o-footer__links, - summary::before, - #search { - display: none; - } - - details[open]::details-content { - display: contents; - } - - a:not(.footnote-ref):not(.o-last-updated)::after { - content: " (" attr(href) ") "; - } -} diff --git a/assets/sass/sidemenu.scss b/assets/sass/sidemenu.scss index e55eb4a7..6b5fb068 100644 --- a/assets/sass/sidemenu.scss +++ b/assets/sass/sidemenu.scss @@ -41,6 +41,10 @@ margin-bottom: 0; } } + + @media print { + display: none; + } } .o-aside a { diff --git a/assets/sass/startpage.scss b/assets/sass/startpage.scss index 4d2a36ae..35049937 100644 --- a/assets/sass/startpage.scss +++ b/assets/sass/startpage.scss @@ -50,6 +50,10 @@ flex-wrap: wrap; gap: 1rem; } + + @media print { + display: none; + } } .o-startpage__news-wrapper { @@ -67,4 +71,8 @@ .o-startpage__search { margin-bottom: 2rem; width: 100%; + + @media print { + display: none; + } } diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index cebfce3b..f7361f2c 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -11,6 +11,11 @@ body { overflow-x: hidden; margin: 0; line-height: 1.5; + + @media print { + print-color-adjust: exact; + font-size: 1.4em; + } } p, @@ -43,11 +48,25 @@ a { &:focus { color: var(--link-hovered); } + + @media print { + text-decoration: none; + color: var(--bs-body-color); + + > .material-symbols-rounded { + display: none; + } + } } main { margin-top: 2rem; padding-left: calc(100vw - 100%); + + @media print { + margin-top: 0; + padding-left: 0; + } } .o-container { @@ -73,6 +92,10 @@ main { max-width: calc(100vw - 3.2rem); } + @media print { + max-width: 100%; + } + width: 100%; margin-left: auto; margin-right: auto; @@ -102,6 +125,10 @@ img { width: 100%; height: auto; border-radius: var(--border-radius-l); + + @media print { + display: none; + } } .o-list__picture { @@ -139,11 +166,21 @@ img { > li { margin-left: 0.5rem; } + + @media print { + list-style-position: inherit !important; + padding-left: 2rem; + } } .o-list__list-item { - &--country { + &--country, + &--operator { list-style-type: none; + + @media print { + list-style: disc !important; + } } } @@ -208,6 +245,11 @@ img { padding: 2rem; border-radius: var(--border-radius-l); border: var(--border); + + @media print { + border: none; + padding: 0; + } } &__content-wrapper { @@ -308,3 +350,9 @@ details > summary { aspect-ratio: 120 / 50; border-radius: var(--border-radius-m); } + +.o-link__external:not(.o-last-updated)::after { + @media print { + content: " (" attr(href) ") "; + } +} diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index 60479967..6208c404 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -25,6 +25,11 @@ font-size: 2.4rem; margin-top: 1rem; } + + @media print { + box-shadow: none; + border: 1px solid black; + } } .m-teaser--listview { @@ -96,6 +101,12 @@ display: flex; flex-direction: column; justify-content: space-between; + + > .material-symbols-rounded { + @media print { + display: none; + } + } } .m-teaser__text { diff --git a/assets/sass/textHighlight.scss b/assets/sass/textHighlight.scss index b43899a8..64065456 100644 --- a/assets/sass/textHighlight.scss +++ b/assets/sass/textHighlight.scss @@ -4,6 +4,10 @@ margin-bottom: 1.2rem; border-radius: var(--border-radius-m); border-left: var(--bg-neutral) solid 1rem; + + @media print { + page-break-inside: avoid; + } } .m-text-highlight__roofline { @@ -20,14 +24,26 @@ .m-text-highlight--tip { background-color: var(--highlight-color-tip); border-left: #1db5df solid 1rem; + + @media print { + border: 0.2rem solid #1db5df; + } } .m-text-highlight--inofficial { background-color: var(--highlight-color-inofficial); border-left: #878c96 solid 1rem; + + @media print { + border: 0.2rem solid #878c96; + } } .m-text-highlight--important { background-color: var(--highlight-color-important); border-left: #ba3d12 solid 1rem; + + @media print { + border: 0.2rem solid #ba3d12; + } } diff --git a/layouts/operator/list.html b/layouts/operator/list.html index 3f87cdb9..13278453 100644 --- a/layouts/operator/list.html +++ b/layouts/operator/list.html @@ -2,17 +2,19 @@

{{ .Title }}

{{ .Content }} -
+
+
{{ end }} diff --git a/layouts/partials/button.html b/layouts/partials/button.html index eb950d61..647ca8d7 100644 --- a/layouts/partials/button.html +++ b/layouts/partials/button.html @@ -2,7 +2,7 @@ href="{{ .Destination }}" target="_blank" rel="noopener noreferrer" - class="a-button" + class="a-button o-link__external" > {{- .Text -}}{{- partial "icon" "arrow_outward" -}} diff --git a/layouts/partials/link.html b/layouts/partials/link.html index 01ce8241..2e08b2fc 100644 --- a/layouts/partials/link.html +++ b/layouts/partials/link.html @@ -1,3 +1,7 @@ -{{- .Text -}}{{- partial "icon" "arrow_outward" -}}