From ffed25032171df280ee6b8ee8e4b9a175920bd5f Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 10 Dec 2023 14:39:27 +0100 Subject: [PATCH 1/3] =?UTF-8?q?bump=202.3.1;=20poprawki=20responsywno?= =?UTF-8?q?=C5=9Bci=20tabelki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- package.json | 2 +- src/App.vue | 6 ++++++ src/mixins/routesMixin.ts | 6 ++---- src/views/ManagerView.vue | 11 +++++++---- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.env b/.env index f845f3a..bdab563 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ VITE_API_URL="https://stacjownik.spythere.eu" VITE_API_URL_DEV="http://localhost:3001" -VITE_API_MODE="PROD" \ No newline at end of file +VITE_API_MODE="DEV" \ No newline at end of file diff --git a/package.json b/package.json index 03b18eb..190eb24 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "station-manager-2.0", "private": true, - "version": "2.3.0", + "version": "2.3.1", "type": "module", "scripts": { "dev": "vite", diff --git a/src/App.vue b/src/App.vue index 64c9913..07a7acd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -147,6 +147,7 @@ button { /* width */ ::-webkit-scrollbar { width: 7px; + height: 7px; } /* Track */ @@ -154,6 +155,11 @@ button { background: #333; } +/* Corner */ +::-webkit-scrollbar-corner { + background: #333; +} + /* Handle */ ::-webkit-scrollbar-thumb { background: #888; diff --git a/src/mixins/routesMixin.ts b/src/mixins/routesMixin.ts index 7b52f0e..1cad6f1 100644 --- a/src/mixins/routesMixin.ts +++ b/src/mixins/routesMixin.ts @@ -9,11 +9,9 @@ export default defineComponent({ // !Oc_2EPB return `${ route.isInternal ? '' + route.routeName + '' : route.routeName - } (${route.routeTracks}/${route.isElectric ? 'E' : 'N'}/${ - route.isRouteSBL ? 'S' : 'P' - })`; + } (${route.routeTracks}/${route.isElectric ? 'E' : 'N'}/${route.isRouteSBL ? 'S' : 'P'})`; }) - .join(', '); + .join(' '); }, }, }); diff --git a/src/views/ManagerView.vue b/src/views/ManagerView.vue index 21609d5..9174bc6 100644 --- a/src/views/ManagerView.vue +++ b/src/views/ManagerView.vue @@ -17,7 +17,7 @@ - + URL URL @@ -181,9 +181,6 @@ table { color: white; position: relative; border-collapse: collapse; - - width: 100%; - min-width: 1800px; } table thead { @@ -202,12 +199,18 @@ table th { table tr { background-color: #2c394b; transition: background-color 100ms; + text-overflow: ellipsis; } table tr.current { outline: 1px solid white; } +table td.routes { + font-size: 0.9em; + min-width: 150px; +} + table tr:nth-child(even) { background-color: #334756; } From 13d3db268eef2749a14600d7eb5cbd91b900a522 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 10 Dec 2023 14:42:28 +0100 Subject: [PATCH 2/3] wykluczenie .env; poprawka http --- .env | 3 --- src/common/http.ts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index bdab563..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -VITE_API_URL="https://stacjownik.spythere.eu" -VITE_API_URL_DEV="http://localhost:3001" -VITE_API_MODE="DEV" \ No newline at end of file diff --git a/src/common/http.ts b/src/common/http.ts index c5f3f83..b99c8fa 100644 --- a/src/common/http.ts +++ b/src/common/http.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -const baseURL = import.meta.env['VITE_API_MODE'] == 'DEV' ? import.meta.env['VITE_API_URL_DEV'] : import.meta.env['VITE_API_URL']; +const baseURL = import.meta.env['VITE_API_MODE'] == 'DEV' ? 'http://localhost:3001' : 'https://stacjownik.spythere.eu'; const client = axios.create({ baseURL: baseURL, From 39d6213e4fe3f5c8db16ca8ca3cb997917e38e29 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 10 Dec 2023 14:58:19 +0100 Subject: [PATCH 3/3] poprawki designu --- src/components/TableActions.vue | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/TableActions.vue b/src/components/TableActions.vue index 698ed36..2931be6 100644 --- a/src/components/TableActions.vue +++ b/src/components/TableActions.vue @@ -50,7 +50,7 @@
Pokazuj maks. - + wyników
@@ -65,7 +65,8 @@
-
Changelog:
+

Changelog:

+
@@ -349,8 +350,17 @@ label.notify { } } .changelog { - height: 200px; - overflow: auto; + position: relative; + + div { + height: 200px; + + overflow: auto; + } + + h3 { + margin: 0; + } } @media screen and (max-width: 550px) { @@ -358,5 +368,9 @@ label.notify { justify-content: center; text-align: center; } + + .changelog h3 { + text-align: center; + } }