From c8f53c2f06cfca55e43415528caa8767189f77a9 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 30 Mar 2024 00:18:54 +0100 Subject: [PATCH] hotfixy designu --- src/App.vue | 3 +-- .../JournalView/JournalTimetables/TimetableHistoryList.vue | 2 +- src/components/PopUp/PopUp.vue | 5 ++++- src/components/PopUp/VehiclePreviewPopUp.vue | 1 - src/components/TrainsView/TrainInfo.vue | 2 +- src/styles/JournalSection.scss | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/App.vue b/src/App.vue index 3a5e999..39d7955 100644 --- a/src/App.vue +++ b/src/App.vue @@ -85,8 +85,6 @@ export default defineComponent({ // popup handling window.addEventListener('mousemove', (e: MouseEvent) => { - e.stopPropagation(); - const targetEl = e .composedPath() .find((p) => p instanceof HTMLElement && p.getAttribute('data-popup-key')); @@ -243,6 +241,7 @@ export default defineComponent({ grid-template-columns: 100%; min-height: 100vh; + position: relative; } .app_main { diff --git a/src/components/JournalView/JournalTimetables/TimetableHistoryList.vue b/src/components/JournalView/JournalTimetables/TimetableHistoryList.vue index 2671486..01de44a 100644 --- a/src/components/JournalView/JournalTimetables/TimetableHistoryList.vue +++ b/src/components/JournalView/JournalTimetables/TimetableHistoryList.vue @@ -5,7 +5,7 @@ v-for="{ timetable, showExtraInfo } in computedTimetableHistory" class="journal_item" :key="timetable.id" - @click.stop.prevent="showExtraInfo.value = !showExtraInfo.value" + @click="showExtraInfo.value = !showExtraInfo.value" >
diff --git a/src/components/PopUp/PopUp.vue b/src/components/PopUp/PopUp.vue index b7b2273..986fb49 100644 --- a/src/components/PopUp/PopUp.vue +++ b/src/components/PopUp/PopUp.vue @@ -31,7 +31,10 @@ export default defineComponent({ let translateX = '0px', translateY = '30px'; - if (val.x <= boxWidth / 2) { + if (clientWidth < 500) { + previewEl.style.left = '50%'; + translateX = '-50%'; + } else if (val.x <= boxWidth / 2) { previewEl.style.left = '0'; translateX = '0px'; } else if (val.x >= clientWidth - boxWidth / 2) { diff --git a/src/components/PopUp/VehiclePreviewPopUp.vue b/src/components/PopUp/VehiclePreviewPopUp.vue index 96becc2..5f59c1b 100644 --- a/src/components/PopUp/VehiclePreviewPopUp.vue +++ b/src/components/PopUp/VehiclePreviewPopUp.vue @@ -10,7 +10,6 @@ v-if="popupStore.currentPopupContent" @load="onImageLoad" @error="onImageError" - @click="popupStore.onPopUpHide" width="300" height="176" class="rounded-md w-full h-auto" diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index aa6f986..afb3965 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -126,7 +126,7 @@ {{ $t('trains.cars') }}: {{ train.stockList.length - 1 }} | - {{ train.speed }}km/h + {{ train.speed }} km/h
diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss index 504cf1f..a37fed7 100644 --- a/src/styles/JournalSection.scss +++ b/src/styles/JournalSection.scss @@ -6,6 +6,7 @@ height: 90vh; min-height: 550px; margin-top: 0.5em; + position: relative; padding-right: 0.2em; }