Skip to content

PB-1522 : fix confederation text shrinking/covered in print view #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −9
Open

PB-1522 : fix confederation text shrinking/covered in print view #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/mapviewer/src/modules/menu/components/header/ConfederationFullLogo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
data-cy="swiss-flag"
/>
<div
class="swiss-confederation-text position-relative flex-column text-nowrap"
class="swiss-confederation-text position-relative flex-column flex-grow-1"
:class="{
'd-none d-lg-flex': renderForDpi === null,
'd-flex': renderForDpi !== null,
Expand Down Expand Up @@ -80,6 +80,7 @@ $letterSpacing: calc((78 / 1000) * 1em);

.swiss-flag {
width: $flagSize;
height: max-content;
}

.swiss-confederation-text {
Expand Down Expand Up @@ -114,14 +115,16 @@ $letterSpacing: calc((78 / 1000) * 1em);
$printFontSizeRelToHeight: 0.8vh;
$printFontSize: max(max($printFontSizeRelToWidth, $printFontSizeRelToHeight), $minFontSize);

// forcing the length of the logo to the 55mm expressed in the CD-Bund PDF guide.
width: 55mm;

@include confederation-logo(
calc(0.66 * $printFontSize),
$printFontSize,
calc(1.2 * $printFontSize)
);

& {
// ensuring the logo and text have enough space
width: 100%;
}
}

.swiss-flag {
Expand Down
10 changes: 5 additions & 5 deletions packages/mapviewer/src/views/PrintView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ async function generateShareLink() {
:style="printContainerStyle"
>
<MapModule class="flex-grow-1">
<div class="north-arrow position-absolute top-0 end-0 m-4 m-xl-5 z-3">
<div class="north-arrow position-absolute m-xl-5 z-3 end-0 top-0 m-4">
<img
src="@/modules/map/assets/north_arrow.png"
:style="northArrowStyle"
Expand All @@ -156,7 +156,7 @@ async function generateShareLink() {
<template #top-right>
<div
v-if="shortLink"
class="print-scale-line d-flex flex-column m-2 me-3 me-xl-3 bg-white p-3 border border-2 border-black"
class="print-scale-line d-flex flex-column me-xl-3 m-2 me-3 border border-2 border-black bg-white p-3"
>
<div class="scale d-flex justify-content-center m-1 mb-3">
<OpenLayersScale
Expand Down Expand Up @@ -192,7 +192,7 @@ async function generateShareLink() {
<img
v-if="shortLink"
:src="qrCodeUrl"
class="qr-code position-relative bottom-0 end-0 z-3 bg-white p-2 m-n1"
class="qr-code position-relative z-3 m-n1 bottom-0 end-0 bg-white p-2"
alt="QR Code"
/>
</template>
Expand All @@ -202,9 +202,9 @@ async function generateShareLink() {
</MapFooter>
</template>
</MapModule>
<div class="print-footer d-flex pt-3 px-3 pb-1 gap-3">
<div class="print-footer d-flex gap-3 p-1">
<ConfederationFullLogo :render-for-dpi="printDPI" />
<div class="print-disclaimer flew-grow-1 px-1 px-md-3 px-xl-5 d-flex flex-column">
<div class="print-disclaimer flex-grow-1 px-md-3 px-xl-5 d-flex flex-column px-1">
<span class="text-justify">{{ t('print_footer_description') }}</span>
<span class="text-justify">{{ t('print_footer_disclaimer') }}</span>
<span class="mt-1">&copy; swisstopo</span>
Expand Down
Loading