diff --git a/package-lock.json b/package-lock.json
index c70bb61..1486632 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2129,38 +2129,12 @@
"dev": true
},
"axios": {
- "version": "0.19.2",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
- "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+ "version": "0.21.1",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+ "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
"dev": true,
"requires": {
- "follow-redirects": "1.5.10"
- },
- "dependencies": {
- "debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
- "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
- "dev": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "follow-redirects": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
- "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
- "dev": true,
- "requires": {
- "debug": "=3.1.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
- }
+ "follow-redirects": "^1.10.0"
}
},
"babel-code-frame": {
diff --git a/package.json b/package.json
index 112d8bb..a16096e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"@vue/cli-plugin-typescript": "~4.4.0",
"@vue/cli-plugin-vuex": "~4.4.0",
"@vue/cli-service": "~4.4.0",
- "axios": "^0.19.2",
+ "axios": "^0.21.1",
"sass": "^1.26.10",
"sass-loader": "^8.0.2",
"typescript": "^3.9.7",
diff --git a/src/App.vue b/src/App.vue
index ca991fa..5f057ec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,8 @@
@@ -59,7 +60,7 @@ export default class App extends Vue {
@Action("synchronizeData") synchronizeData;
@Getter("getAllData") data;
- private VERSION = "1.3.6";
+ private VERSION = "1.4a";
async mounted() {
this.synchronizeData();
@@ -104,12 +105,12 @@ export default class App extends Vue {
background: $bgCol;
color: white;
- font-size: calc(1.1rem + 2.1vw);
-
overflow: hidden;
- @include smallScreen() {
- font-size: 2.5rem;
+ font-size: calc(0.4rem + 0.4vw);
+
+ @include bigScreen {
+ font-size: 1rem;
}
}
@@ -132,11 +133,15 @@ export default class App extends Vue {
display: flex;
justify-content: center;
+
+ @include smallScreen() {
+ font-size: 1.2em;
+ }
}
.header_brand {
width: 100%;
- font-size: 1.1em;
+ font-size: 4.5em;
text-align: center;
@@ -149,9 +154,14 @@ export default class App extends Vue {
display: flex;
justify-content: space-between;
+ font-size: 1.35em;
+
margin: 0 0.3em;
padding: 0.2em;
- font-size: 0.35em;
+
+ @include smallScreen() {
+ font-size: 1.5em;
+ }
}
.header_links {
@@ -160,8 +170,12 @@ export default class App extends Vue {
border-radius: 0.7em;
- padding: 0.2em;
- font-size: 0.35em;
+ font-size: 1.2em;
+ padding: 0.5em;
+
+ @include smallScreen() {
+ font-size: 1.4em;
+ }
}
// COUNTER
@@ -170,8 +184,6 @@ export default class App extends Vue {
align-items: center;
color: $accentCol;
- font-size: 1em;
-
span {
margin: 0 0.15em;
}
diff --git a/src/components/App/Clock.vue b/src/components/App/Clock.vue
index 3bf4f57..efdb454 100644
--- a/src/components/App/Clock.vue
+++ b/src/components/App/Clock.vue
@@ -32,9 +32,5 @@ export default Vue.extend({
display: flex;
justify-content: center;
align-items: center;
-
- @include smallScreen() {
- font-size: 0.95rem;
- }
}
\ No newline at end of file
diff --git a/src/components/Global/Dropdown.vue b/src/components/Global/Dropdown.vue
new file mode 100644
index 0000000..ac39083
--- /dev/null
+++ b/src/components/Global/Dropdown.vue
@@ -0,0 +1,93 @@
+
+
+
+
+ {{selectedItem}}
+
![arrow]()
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Global/Modal.vue b/src/components/Global/Modal.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/StationsView/FilterCard.vue b/src/components/StationsView/FilterCard.vue
index df4c505..d61fc87 100644
--- a/src/components/StationsView/FilterCard.vue
+++ b/src/components/StationsView/FilterCard.vue
@@ -164,13 +164,12 @@ export default class FilterCard extends Vue {
background: #262a2e;
- font-size: calc(0.75rem + 0.45vw);
+ font-size: 1.5em;
box-shadow: 0 0 15px 5px #474747;
@include smallScreen() {
- width: 100%;
- font-size: calc(0.7em + 1.1vw);
+ width: 95%;
}
@include bigScreen {
diff --git a/src/components/StationsView/Options.vue b/src/components/StationsView/Options.vue
index 7df6583..201b887 100644
--- a/src/components/StationsView/Options.vue
+++ b/src/components/StationsView/Options.vue
@@ -80,8 +80,6 @@ export default class Options extends Vue {
}
.options {
- font-size: calc(0.6rem + 0.9vw);
-
&-actions {
display: flex;
}
@@ -95,7 +93,7 @@ export default class Options extends Vue {
border: none;
color: #e0e0e0;
- font-size: 0.75em;
+ font-size: 0.4em;
padding: 0.3em;
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index e0665e8..e7556c7 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -164,7 +164,6 @@
+
+
\ No newline at end of file
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index b6f4287..dc83ec4 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -96,7 +96,7 @@ h3 {
display: flex;
justify-content: center;
- font-size: calc(0.5rem + 0.65vw);
+ font-size: 1.35em;
@include bigScreen() {
font-size: 1.25rem;
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index 8ed1560..029f622 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -247,10 +247,10 @@ export default class StationsView extends Vue {
.stations_view {
position: relative;
+ font-size: 0.95em;
+
padding: 1rem 0;
min-height: 100%;
-
- font-size: calc(0.6rem + 0.9vw);
}
.stations_wrapper {
@@ -270,6 +270,7 @@ export default class StationsView extends Vue {
.bar_actions {
display: flex;
+ font-size: 1.25em;
button {
margin-right: 0.5em;
@@ -285,13 +286,12 @@ export default class StationsView extends Vue {
justify-content: center;
align-items: center;
- width: 1.2em;
- height: 1.2em;
-
+ width: 2.5em;
+ height: 2.5em;
margin-left: 0.5em;
// background-color: #e68e00;
- border-radius: 0.5em 0.5em 0 0;
+ border-radius: 1em 1em 0 0;
&.loading {
background-color: $accentCol;
@@ -306,14 +306,9 @@ export default class StationsView extends Vue {
}
& > img {
- width: 0.9em;
+ width: 1.7em;
animation: blinkAnim 2s ease-in-out infinite forwards;
}
-
- @include smallScreen() {
- width: 1.5em;
- height: 1.5em;
- }
}
}
@@ -325,7 +320,7 @@ export default class StationsView extends Vue {
border: none;
color: #e0e0e0;
- font-size: 0.65em;
+ font-size: 1em;
padding: 0.3em;
@@ -356,7 +351,7 @@ export default class StationsView extends Vue {
}
@include smallScreen() {
- font-size: 0.75rem;
+ font-size: 1.2em;
}
}