From 943dd19c098df7ff0cc08d9d55525190aaab88e3 Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Tue, 7 Nov 2023 21:27:33 +0100 Subject: [PATCH] style: wording and UI tweaks (#564) * style: wording and UI tweaks * style: prevent note overflow * style: small wording changes * soft blink (#569) * chore: version bump --------- Co-authored-by: Alex Christoffer Rasmussen --- apps/client/package.json | 2 +- .../src/features/cuesheet/CuesheetWrapper.tsx | 6 +----- apps/client/src/features/menu/MenuBar.tsx | 6 +----- .../features/modals/export-modal/ExportModal.tsx | 13 +++++-------- .../rundown/event-block/EventBlock.module.scss | 3 +++ .../features/viewers/backstage/Backstage.scss | 16 +++++++++++----- apps/electron/package.json | 2 +- apps/server/package.json | 2 +- .../src/controllers/integrationController.ts | 6 +++--- package.json | 2 +- 10 files changed, 28 insertions(+), 30 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index 4997ce6d0..d504d2321 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,6 +1,6 @@ { "name": "ontime-ui", - "version": "2.9.0", + "version": "2.13.1", "private": true, "dependencies": { "@chakra-ui/react": "^2.7.0", diff --git a/apps/client/src/features/cuesheet/CuesheetWrapper.tsx b/apps/client/src/features/cuesheet/CuesheetWrapper.tsx index 9aab2414b..19b996408 100644 --- a/apps/client/src/features/cuesheet/CuesheetWrapper.tsx +++ b/apps/client/src/features/cuesheet/CuesheetWrapper.tsx @@ -141,11 +141,7 @@ export default function CuesheetWrapper() {
- +
); } diff --git a/apps/client/src/features/menu/MenuBar.tsx b/apps/client/src/features/menu/MenuBar.tsx index 994f08a5a..5281bc24d 100644 --- a/apps/client/src/features/menu/MenuBar.tsx +++ b/apps/client/src/features/menu/MenuBar.tsx @@ -151,11 +151,7 @@ const MenuBar = (props: MenuBarProps) => { size='sm' /> - +
void; - buttonVariants: { - csv: string; - json: string; - }; } export default function ExportModal(props: ExportModalProps) { - const { isOpen, onClose, buttonVariants } = props; + const { isOpen, onClose } = props; return ( @@ -22,10 +19,10 @@ export default function ExportModal(props: ExportModalProps) { Download options - - diff --git a/apps/client/src/features/rundown/event-block/EventBlock.module.scss b/apps/client/src/features/rundown/event-block/EventBlock.module.scss index aa57c8d73..7365f74fd 100644 --- a/apps/client/src/features/rundown/event-block/EventBlock.module.scss +++ b/apps/client/src/features/rundown/event-block/EventBlock.module.scss @@ -175,6 +175,9 @@ $skip-opacity: 0.1; font-size: calc(1rem - 3px); color: $block-text-color; line-height: calc(1rem - 3px); + + max-height: 2rem; + overflow-y: hidden; } diff --git a/apps/client/src/features/viewers/backstage/Backstage.scss b/apps/client/src/features/viewers/backstage/Backstage.scss index 4198a4337..208ed1aee 100644 --- a/apps/client/src/features/viewers/backstage/Backstage.scss +++ b/apps/client/src/features/viewers/backstage/Backstage.scss @@ -89,7 +89,10 @@ border-radius: 8px; &.blink { - animation: blink 0.5s ease-in-out 3; + animation-name: blink; + animation-timing-function: ease-in-out; + animation-iteration-count: 3; + animation-duration: 1s; } } @@ -163,9 +166,12 @@ @keyframes blink { 0% { - background-color: var(--card-background-color-blink-override, $playback-start); - } - 20% { background-color: var(--card-background-color-override, $viewer-card-bg-color); } -} + 50% { + background-color: var(--card-background-color-blink-override, $playback-start); + } + 100% { + background-color: var(--card-background-color-override, $viewer-card-bg-color); + } +} \ No newline at end of file diff --git a/apps/electron/package.json b/apps/electron/package.json index e04fa41fc..1e235f598 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.9.0", + "version": "2.13.1", "author": "Carlos Valente", "description": "Time keeping for live events", "repository": "https://github.com/cpvalente/ontime", diff --git a/apps/server/package.json b/apps/server/package.json index 7cf084cb7..067a9cc61 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -2,7 +2,7 @@ "name": "ontime-server", "type": "module", "main": "src/index.ts", - "version": "2.9.0", + "version": "2.13.1", "exports": "./src/index.js", "dependencies": { "body-parser": "^1.20.0", diff --git a/apps/server/src/controllers/integrationController.ts b/apps/server/src/controllers/integrationController.ts index 1a7607f2b..4c16f09ee 100644 --- a/apps/server/src/controllers/integrationController.ts +++ b/apps/server/src/controllers/integrationController.ts @@ -1,4 +1,4 @@ -import { LogOrigin, OntimeEvent } from 'ontime-types'; +import { OntimeEvent } from 'ontime-types'; import { messageService } from '../services/message-service/MessageService.js'; import { PlaybackService } from '../services/PlaybackService.js'; @@ -256,10 +256,10 @@ export function dispatchFromAdapter( // ontime/change/{eventID}/{propertyName} case 'change': { if (params.length < 2) { - throw new Error(`To few parameters`); + throw new Error('Too few parameters, 3 expected'); } if (payload === undefined) { - throw new Error(`Undefined payload`); + throw new Error('No payload found'); } const eventID = params[0]; const propertyName = params[1] as keyof OntimeEvent; diff --git a/package.json b/package.json index f0f157cee..7b24736f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.9.0", + "version": "2.13.1", "description": "Time keeping for live events", "keywords": [ "lighdev",