diff --git a/src/App.vue b/src/App.vue index 6fad4f1..5c61fe0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -229,7 +229,7 @@ export default class App extends Vue { font-size: 1rem; @include smallScreen() { - font-size: calc(0.35rem + 1vw); + font-size: calc(0.45rem + 1vw); } } diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue index 9f2823a..81d32dc 100644 --- a/src/components/SceneryView/SceneryInfo.vue +++ b/src/components/SceneryView/SceneryInfo.vue @@ -21,16 +21,19 @@ icon-like {{ stationInfo.dispatcherRate }} + icon-user {{ stationInfo.currentUsers }} / {{ stationInfo.maxUsers }} + icon-spawn {{ stationInfo.spawns.length }} + icon-timetable @@ -253,7 +256,7 @@ h3 { font-weight: bold; color: $accentCol; - font-size: 4em; + font-size: 3.5em; text-transform: uppercase; } @@ -270,15 +273,16 @@ h3 { padding: 1rem 0; display: flex; + flex-wrap: wrap; justify-content: center; - font-size: 1.7em; + font-size: 1.65em; & > span { display: flex; align-items: center; - margin: 0 0.6em; + margin: 0.3em; } .likes, diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index db50f08..1f630ad 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -350,7 +350,7 @@ h3 { padding: 0 0.35em; - background: #555; + background: $bgLigtherCol; @include smallScreen() { display: flex; @@ -361,7 +361,7 @@ h3 { &.loading, &.empty { padding: 1rem; - font-size: 1em; + font-size: 1.2em; } &.empty { @@ -389,12 +389,12 @@ h3 { &-schedule { display: grid; - grid-template-columns: repeat(auto-fit, minmax(50px, 1fr)); - font-size: 1.2em; + grid-template-columns: repeat(auto-fit, minmax(30px, 1fr)); + font-size: 1.3em; @include smallScreen() { width: 100%; - margin: 0.7em 0; + margin: 0.5em 0; } } } diff --git a/src/components/TrainsView/TrainOptions.vue b/src/components/TrainsView/TrainOptions.vue index a0c9f03..1f0c8c5 100644 --- a/src/components/TrainsView/TrainOptions.vue +++ b/src/components/TrainsView/TrainOptions.vue @@ -81,6 +81,13 @@ export default class TrainOptions extends Vue { @Prop() readonly queryTrain!: string; @Prop() readonly focusedTrain!: string; + mounted() { + if (this.queryTrain) { + this.searchedTrain = this.queryTrain; + this.searchedDriver = ""; + } + } + sorterOptions: { id: string; content: string }[] = [ { id: "mass", diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 91646db..f2baddf 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,7 +1,8 @@ -$primaryCol: #2f2f2f; +$primaryCol: #2c2c2c; $secondaryCol: #01e733; -$bgCol: #505050; +$bgCol: #4d4d4d; +$bgLigtherCol: #555; $errorCol: #ff1919; $warningCol: #ffe15b; diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index 98ecd18..f78478b 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -68,6 +68,8 @@ export default class SceneryView extends Vue { @import "../styles/responsive.scss"; @import "../styles/variables.scss"; +$sceneryBgCol: #333; + .scenery { &-view { min-height: 100%; @@ -94,7 +96,6 @@ export default class SceneryView extends Vue { } &-wrapper { - // background: #555; width: 75%; max-width: 950px; @@ -102,10 +103,7 @@ export default class SceneryView extends Vue { width: 95%; } - // max-height: 100vh; - // overflow: auto; - - background: #333; + background: $sceneryBgCol; padding: 1em; margin: 1rem 0; diff --git a/src/views/TrainsView.vue b/src/views/TrainsView.vue index 040a9ea..f98eee1 100644 --- a/src/views/TrainsView.vue +++ b/src/views/TrainsView.vue @@ -73,7 +73,6 @@ export default class TrainsView extends Vue { changeSorter(sorter: { id: string; dir: number }) { this.sorterActive = sorter; } - get computedTrains() { return this.trains .filter(