From 726e38e27a3ee54ca2a1666a6ff411a3f0edf8d6 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Sun, 12 May 2024 20:48:50 +0200 Subject: [PATCH 1/3] style: consistent spacing in editor --- apps/client/src/features/editors/Editor.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/features/editors/Editor.module.scss b/apps/client/src/features/editors/Editor.module.scss index 9b15b64738..e9caaf458f 100644 --- a/apps/client/src/features/editors/Editor.module.scss +++ b/apps/client/src/features/editors/Editor.module.scss @@ -13,7 +13,7 @@ $panel-gap: 0.5rem; width: 100%; height: 100%; color: $ui-white; - padding: 1rem 0.5rem; + padding: 0.5rem; display: grid; grid-template-columns: auto; From 35532333e62b2ce863fab973ebf28bb0431c051c Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Fri, 17 May 2024 21:11:38 +0200 Subject: [PATCH 2/3] style: tweaks to shortcut panel --- .../event-editor/EventEditorEmpty.module.scss | 15 +++- .../rundown/event-editor/EventEditorEmpty.tsx | 84 +++++++++---------- apps/client/src/theme/theme.ts | 2 +- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/apps/client/src/features/rundown/event-editor/EventEditorEmpty.module.scss b/apps/client/src/features/rundown/event-editor/EventEditorEmpty.module.scss index 1eceed8411..4fdcb8fb26 100644 --- a/apps/client/src/features/rundown/event-editor/EventEditorEmpty.module.scss +++ b/apps/client/src/features/rundown/event-editor/EventEditorEmpty.module.scss @@ -14,23 +14,32 @@ flex: 1; display: grid; place-content: center; - font-size: calc(1rem - 2px); + gap: 1rem; } .shortcuts { - margin-top: 0.5rem; + font-size: calc(1rem - 3px); border-collapse: separate; - border-spacing: 1rem 0; + border-spacing: 4rem 0; tr { td:nth-child(odd) { + text-align: left; + } + td:nth-child(even) { text-align: right; } } } +.spacer { + height: 1rem; +} + .prompt { font-size: 1rem; + text-align: left; + margin-left: 4rem; } .divider { diff --git a/apps/client/src/features/rundown/event-editor/EventEditorEmpty.tsx b/apps/client/src/features/rundown/event-editor/EventEditorEmpty.tsx index 5151b17599..b2e57dc70a 100644 --- a/apps/client/src/features/rundown/event-editor/EventEditorEmpty.tsx +++ b/apps/client/src/features/rundown/event-editor/EventEditorEmpty.tsx @@ -10,13 +10,12 @@ export default memo(EventEditorEmpty); function EventEditorEmpty() { return (
-
Select an event to edit
-
Shortcut navigation
- +
Rundown shortcuts:
+ - + + + + + + - + - + - + - + - + + - + - + - + - + - + - - - - -
Select entry {deviceAlt} + @@ -24,9 +23,16 @@ function EventEditorEmpty() { / ↓ Select entry
Deselect entry + Esc +
Reorder selected entry {deviceAlt} + @@ -36,101 +42,95 @@ function EventEditorEmpty() { / ↑ Reorder selected entry
Copy selected entry - {deviceAlt} + {deviceMod} + - E + C Add event below
Paste above - {deviceAlt} + {deviceMod} + ↑ + - E + V Add event above
Paste below - {deviceAlt} + {deviceMod} + - B + V Add block below
Delete selected entry - {deviceAlt} - + - ↑ + {deviceMod} + - B + ⌫ Add block above
Add event below {deviceAlt} + - D + E Add delay below
Add event above {deviceAlt} + ↑ + - D + E Add delay above
Add block below - Esc + {deviceAlt} + + + B Deselect entry
Add block above - {deviceMod} + {deviceAlt} + - ⌫ + ↑ + + + B Delete selected entry
Add delay below - {deviceMod} + {deviceAlt} + - C + D Copy selected entry
Add delay above - {deviceMod} + {deviceAlt} + ↑ + - V - Paste above
- {deviceMod} - + - V + D Paste below
diff --git a/apps/client/src/theme/theme.ts b/apps/client/src/theme/theme.ts index 6ac4cdb748..ee6b00e46e 100644 --- a/apps/client/src/theme/theme.ts +++ b/apps/client/src/theme/theme.ts @@ -84,7 +84,7 @@ const theme = extendTheme({ baseStyle: { borderRadius: '2px', border: 'none', - background: 'rgba(255, 255, 255, 0.10)', + background: '#262626', // $gray-1200 padding: '0.125rem 0.5rem', color: '#f6f6f6', // $ui-white fontWeight: 400, From 8c5a1f2f41d5d618a484210ab2e9286b3ad4b372 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Sun, 19 May 2024 12:04:28 +0200 Subject: [PATCH 3/3] style: rundown takes available space --- apps/client/src/features/rundown/RundownExport.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/features/rundown/RundownExport.module.scss b/apps/client/src/features/rundown/RundownExport.module.scss index 57f5f92b87..c36053f106 100644 --- a/apps/client/src/features/rundown/RundownExport.module.scss +++ b/apps/client/src/features/rundown/RundownExport.module.scss @@ -36,7 +36,7 @@ flex: 1 2 auto; /* flex-grow: 1, flex-shrink: 2, flex-basis: auto */ min-width: 38rem; - max-width: 45rem; + max-width: 60rem; } .side {