diff --git a/package.json b/package.json index 190eb24..cc0df9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "station-manager-2.0", "private": true, - "version": "2.3.1", + "version": "2.4.0", "type": "module", "scripts": { "dev": "vite", diff --git a/src/App.vue b/src/App.vue index 07a7acd..0539951 100644 --- a/src/App.vue +++ b/src/App.vue @@ -96,7 +96,7 @@ button { outline: none; border: none; - background-color: #0066ff; + background-color: #3c5a89; color: white; padding: 0.5em 0.5em; @@ -107,13 +107,26 @@ button { cursor: pointer; transition: all 75ms; + &:hover:not([data-disabled='true']), &:focus-visible { - outline: 1px solid gold; + background-color: lighten($color: #3c5a89, $amount: 10%); + } + + &[data-disabled='true'] { + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + + color: #999; + } + + &.btn--icon { + background-color: transparent; + padding: 0; } - &:hover, &:focus-visible { - background-color: lighten($color: #0066ff, $amount: 10%); + outline: 1px solid gold; } } diff --git a/src/components/Changelog.vue b/src/components/Changelog.vue new file mode 100644 index 0000000..c5e4b68 --- /dev/null +++ b/src/components/Changelog.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/components/RouteList.vue b/src/components/RouteList.vue new file mode 100644 index 0000000..bbc0424 --- /dev/null +++ b/src/components/RouteList.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/RoutesModal.vue b/src/components/RoutesModal.vue index cd5d2fc..c7b4456 100644 --- a/src/components/RoutesModal.vue +++ b/src/components/RoutesModal.vue @@ -14,45 +14,34 @@
  • - - Szlak: -   + Szlak: - - + +
    - icon trash +
    + +   +
    Liczba torów:
    @@ -60,24 +49,12 @@ Elektryfikacja: @@ -183,9 +160,9 @@ export default defineComponent({ const routeString = this.store.currentStation?.routesInfo .map( (route) => - `${route.isInternal ? '!' : ''}${route.routeName.trim()}_${route.routeTracks}${ - route.isElectric ? 'E' : 'N' - }${route.isRouteSBL ? 'S' : 'P'}:${route.routeSpeed || 0}:${route.routeLength || 0}` + `${route.isInternal ? '!' : ''}${route.routeName.trim()}_${route.routeTracks}${route.isElectric ? 'E' : 'N'}${ + route.isRouteSBL ? 'S' : 'P' + }:${route.routeSpeed || 0}:${route.routeLength || 0}` ) .join(';'); @@ -197,11 +174,10 @@ export default defineComponent({ if (index == -1) return; - const routeString = this.parseRoutes(); + // const routeString = this.parseRoutes(); this.addChange(this.store.currentStation!, 'routesInfo', this.routeBackup, this.currentRoutes); this.store.stationList[index]['routesInfo'] = this.currentRoutes; - // this.currentRoutes.push(this.cur) }, }, }); @@ -334,6 +310,12 @@ ul li { background-color: #222; } +li > form { + display: flex; + flex-direction: column; + gap: 0.25em; +} + .route-delete { margin: 0.5em; width: 1.15em; @@ -346,7 +328,6 @@ ul li { justify-content: center; flex-wrap: wrap; gap: 0.5em; - background-color: #333; width: 100%; padding: 0.5em 0; diff --git a/src/components/TableActions.vue b/src/components/TableActions.vue index 2931be6..04885f7 100644 --- a/src/components/TableActions.vue +++ b/src/components/TableActions.vue @@ -61,27 +61,23 @@
    - +
    -
    -

    Changelog:

    -
    - -
    -
    +