diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 76caee8..4bc789e 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -407,7 +407,7 @@ export default defineComponent({ $rowCol: #424242; .station_table { - height: 90vh; + height: calc(100vh - 10em); max-height: 2000px; min-height: 700px; overflow: auto; diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue index 76126ce..eddd4a4 100644 --- a/src/components/TrainsView/TrainTable.vue +++ b/src/components/TrainsView/TrainTable.vue @@ -82,6 +82,9 @@ export default defineComponent({ @import '../../styles/animations.scss'; .train-table { + height: calc(100vh - 8em); + min-height: 550px; + position: relative; overflow-y: auto; overflow-x: hidden; diff --git a/src/router/index.ts b/src/router/index.ts index 53ec168..90de42b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -69,7 +69,8 @@ const router = createRouter({ if ( (to.name == 'SceneryView' || to.name == 'DriverView') && from.name !== to.name && - from.query['view'] === undefined + from.query['view'] === undefined && + !savedPosition ) return { el: `.app_main`, top: -15 }; @@ -79,10 +80,4 @@ const router = createRouter({ routes }); -router.beforeEach((to, from, next) => { - next((vm) => { - (vm as any)['xd'] = 'xd'; - }); -}); - export default router; diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss index df3867c..9c2f5ad 100644 --- a/src/styles/JournalSection.scss +++ b/src/styles/JournalSection.scss @@ -11,7 +11,7 @@ .list_wrapper { overflow-y: auto; - height: 90vh; + height: calc(100vh - 10em); min-height: 650px; margin-top: 0.5em; position: relative; diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index f0b3d8c..a1a3441 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -234,7 +234,7 @@ button.back-btn { padding: 1em 0.5em; height: calc(100vh - 0.5em); - min-height: 800px; + min-height: 500px; max-height: 2000px; }