diff --git a/src/App.vue b/src/App.vue index e060dc2..6ba09c0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -98,6 +98,9 @@ import Clock from "@/components/App/Clock.vue"; import StorageManager from "@/scripts/storageManager"; +import DataModule from "@/store/modules/DataModule"; +import { getModule } from "vuex-module-decorators"; + @Component({ components: { Clock, UpdateModal }, }) @@ -115,9 +118,19 @@ export default class App extends Vue { iconEN = require("@/assets/icon-en.jpg"); iconPL = require("@/assets/icon-pl.svg"); + dataStore: DataModule = getModule(DataModule); + + get test() { + return this.dataStore.getTest; + } + mounted() { this.synchronizeData(); + setTimeout(() => { + this.dataStore.fetchTest(); + }, 3000); + if (StorageManager.getStringValue("lang")) { this.changeLang(StorageManager.getStringValue("lang")); } else if (window.navigator.language) { @@ -213,23 +226,19 @@ export default class App extends Vue { overflow: hidden; - font-size: calc(0.7rem + 0.2vw); + font-size: 1rem; - @include bigScreen { - font-size: 1rem; + @include midScreen() { + font-size: 0.95rem; } - @include smallScreen { - font-size: 0.6rem; + @include smallScreen() { + font-size: 0.7rem; } } // CONTAINER .app_container { - // display: grid; - // grid-template-rows: auto 1fr auto; - // grid-template-columns: minmax(0, 1fr); - display: flex; flex-flow: column; @@ -264,7 +273,7 @@ export default class App extends Vue { &_brand { position: relative; width: 100%; - font-size: 4.5em; + font-size: 4.25em; text-align: center; @@ -276,10 +285,10 @@ export default class App extends Vue { position: absolute; right: 0; - transform: translate(110%, -40%); + transform: translate(110%, -35%); img { - width: 0.5em; + width: 0.6em; } cursor: pointer; @@ -290,7 +299,7 @@ export default class App extends Vue { display: flex; justify-content: space-between; - font-size: 1.35em; + font-size: 1.25em; margin: 0 0.3em; padding: 0.2em; @@ -302,7 +311,7 @@ export default class App extends Vue { border-radius: 0.7em; - font-size: 1.35em; + font-size: 1.25em; padding: 0.5em; } } @@ -325,7 +334,7 @@ export default class App extends Vue { // FOOTER footer.app_footer { max-width: 100%; - padding: 0.3rem; + padding: 0.5em; z-index: 10; diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue index 42bb30d..20e704b 100644 --- a/src/components/SceneryView/SceneryInfo.vue +++ b/src/components/SceneryView/SceneryInfo.vue @@ -346,7 +346,7 @@ h3 { .user, .spawn { font-weight: 600; - font-size: 0.9em; + font-size: 0.85em; display: inline-block; padding: 0; diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index 2d703d3..a573791 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -265,7 +265,7 @@ h3 { } label { - padding: 0.5rem 1rem; + padding: 0.5em 0.35em; cursor: pointer; } } @@ -292,12 +292,12 @@ h3 { justify-content: space-between; align-items: center; - padding: 0.5rem 1rem; + padding: 0.35em 0.7em; min-width: 10em; cursor: pointer; span { - margin-right: 2rem; + margin-right: 2em; } img { @@ -346,7 +346,7 @@ h3 { display: grid; grid-template-columns: repeat(auto-fit, minmax(0, 1fr)); - padding: 0 0.5rem; + padding: 0 0.35em; background: #555; diff --git a/src/components/StationsView/FilterCard.vue b/src/components/StationsView/FilterCard.vue index de43a42..0b61320 100644 --- a/src/components/StationsView/FilterCard.vue +++ b/src/components/StationsView/FilterCard.vue @@ -152,7 +152,11 @@ export default class FilterCard extends Vue { @import "../../styles/card"; .card { - font-size: 1.45em; + font-size: 1.25em; + + @include smallScreen() { + font-size: 1.35em; + } &-title { font-size: 2em; @@ -186,6 +190,7 @@ export default class FilterCard extends Vue { button { margin: 0 0.3em; border: 1px solid white; + font-size: 0.85em; } } diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 04d8b64..d9f708a 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -208,7 +208,7 @@