diff --git a/apps/client/src/features/control/playback/timer-display/TimerDisplay.module.scss b/apps/client/src/features/control/playback/timer-display/TimerDisplay.module.scss index 0e6b0e992..c93ddff23 100644 --- a/apps/client/src/features/control/playback/timer-display/TimerDisplay.module.scss +++ b/apps/client/src/features/control/playback/timer-display/TimerDisplay.module.scss @@ -16,4 +16,8 @@ &.finished { color: $timer-finished-color; } + + &.muted { + color: $muted-gray; + } } diff --git a/apps/client/src/features/control/playback/timer-display/TimerDisplay.tsx b/apps/client/src/features/control/playback/timer-display/TimerDisplay.tsx index 5234bad7b..945ac5d68 100644 --- a/apps/client/src/features/control/playback/timer-display/TimerDisplay.tsx +++ b/apps/client/src/features/control/playback/timer-display/TimerDisplay.tsx @@ -19,7 +19,7 @@ export default function TimerDisplay(props: TimerDisplayProps) { const isNegative = (time ?? 0) < 0; const display = time == null ? timerPlaceholder : millisToString(time, { fallback: timerPlaceholder }).replace('-', ''); - const classes = cx([style.timer, isNegative ? style.finished : null]); + const classes = cx([style.timer, isNegative ? style.finished : null, time === null && style.muted]); return
{display}
; } diff --git a/apps/client/src/features/overview/Overview.tsx b/apps/client/src/features/overview/Overview.tsx index 8bcb3a39f..1e10a82d7 100644 --- a/apps/client/src/features/overview/Overview.tsx +++ b/apps/client/src/features/overview/Overview.tsx @@ -4,7 +4,7 @@ import { millisToString } from 'ontime-utils'; import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary'; import { useIsOnline, useRuntimeOverview, useRuntimePlaybackOverview, useTimer } from '../../common/hooks/useSocket'; import useProjectData from '../../common/hooks-query/useProjectData'; -import { cx, enDash } from '../../common/utils/styleUtils'; +import { cx, enDash, timerPlaceholder } from '../../common/utils/styleUtils'; import { TimeColumn, TimeRow } from './composite/TimeLayout'; import { calculateEndAndDaySpan, formatedTime, getOffsetText } from './overviewUtils'; @@ -26,15 +26,37 @@ function _EditorOverview({ children }: PropsWithChildren) {
- - + +
- - + +
); @@ -57,8 +79,20 @@ function _CuesheetOverview({ children }: PropsWithChildren) {
- - + +
); @@ -100,15 +134,22 @@ function CurrentBlockOverview() { const timeInBlock = formatedTime(currentBlock.startedAt === null ? null : clock - currentBlock.startedAt); - return ; + return ( + + ); } function TimerOverview() { const { current } = useTimer(); - const display = millisToString(current); + const display = millisToString(current, { fallback: timerPlaceholder }); - return ; + return ; } function ProgressOverview() { diff --git a/apps/client/src/features/overview/composite/TimeLayout.module.scss b/apps/client/src/features/overview/composite/TimeLayout.module.scss index 74be3a53b..baeb795a7 100644 --- a/apps/client/src/features/overview/composite/TimeLayout.module.scss +++ b/apps/client/src/features/overview/composite/TimeLayout.module.scss @@ -44,6 +44,10 @@ content: "*"; vertical-align: super; font-size: 0.75em; - color: $blue-500; + color: $info-blue; } } + +.muted { + color: $muted-gray; +} diff --git a/apps/client/src/features/overview/composite/TimeLayout.tsx b/apps/client/src/features/overview/composite/TimeLayout.tsx index aefc3cc5e..181af8da1 100644 --- a/apps/client/src/features/overview/composite/TimeLayout.tsx +++ b/apps/client/src/features/overview/composite/TimeLayout.tsx @@ -7,20 +7,21 @@ import style from './TimeLayout.module.scss'; interface TimeLayoutProps { label: string; value: string; + muted?: boolean; daySpan?: number; className?: string; } -export function TimeColumn({ label, value, className }: TimeLayoutProps) { +export function TimeColumn({ label, value, muted, className }: TimeLayoutProps) { return (
{label} - {value} + {value}
); } -export function TimeRow({ label, value, daySpan, className }: TimeLayoutProps) { +export function TimeRow({ label, value, daySpan, muted, className }: TimeLayoutProps) { return (
{label} @@ -29,7 +30,7 @@ export function TimeRow({ label, value, daySpan, className }: TimeLayoutProps) { {value} ) : ( - {value} + {value} )}
); diff --git a/apps/client/src/theme/_ontimeStyles.scss b/apps/client/src/theme/_ontimeStyles.scss index 46cb5962b..689b26100 100644 --- a/apps/client/src/theme/_ontimeStyles.scss +++ b/apps/client/src/theme/_ontimeStyles.scss @@ -52,6 +52,7 @@ $main-spacing: 2rem; $ontime-font-family: "Open Sans", "Segoe UI", sans-serif; $label-gray: $gray-400; $secondary-text-gray: $gray-400; +$muted-gray: $gray-600; $section-white: $ui-white; $inner-section-text-size: calc(1rem - 2px); $text-body-size: calc(1rem - 1px);