Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: consistent spacing in editor #963

Merged
merged 4 commits into from
May 20, 2024
Merged

style: consistent spacing in editor #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
726e38e
style: consistent spacing in editor
cpvalente May 12, 2024
3553233
style: tweaks to shortcut panel
cpvalente May 17, 2024
8c5a1f2
style: rundown takes available space
cpvalente May 19, 2024
487b739
Merge branch 'master' into style-tweaks
cpvalente May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/client/src/features/editors/Editor.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/features/rundown/RundownExport.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 12 additions & 3 deletions apps/client/src/features/rundown/event-editor/EventEditorEmpty.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
84 changes: 42 additions & 42 deletions apps/client/src/features/rundown/event-editor/EventEditorEmpty.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,29 @@ export default memo(EventEditorEmpty);
function EventEditorEmpty() {
return (
<div className={style.eventEditor} data-testid='editor-container'>
<div className={style.prompt}>Select an event to edit</div>
<div className={style.shortcutSection}>
<div className={style.prompt}>Shortcut navigation</div>

<div className={style.prompt}>Rundown shortcuts:</div>
<table className={style.shortcuts}>
<tbody>
<tr>
<td>Select entry</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>↑</Kbd>
<AuxKey>/</AuxKey>
<Kbd>↓</Kbd>
</td>
<td>Select entry</td>
</tr>
<tr>
<td>Deselect entry</td>
<td>
<Kbd>Esc</Kbd>
</td>
</tr>
<tr className={style.spacer} />
<tr>
<td>Reorder selected entry</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
Expand All @@ -36,101 +42,95 @@ function EventEditorEmpty() {
<AuxKey>/</AuxKey>
<Kbd>↑</Kbd>
</td>
<td>Reorder selected entry</td>
</tr>
<tr>
<td>Copy selected entry</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<Kbd>{deviceMod}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>E</Kbd>
<Kbd>C</Kbd>
</td>
<td>Add event below</td>
</tr>
<tr>
<td>Paste above</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<Kbd>{deviceMod}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>↑</Kbd>
<AuxKey>+</AuxKey>
<Kbd>E</Kbd>
<Kbd>V</Kbd>
</td>
<td>Add event above</td>
</tr>
<tr>
<td>Paste below</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<Kbd>{deviceMod}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>B</Kbd>
<Kbd>V</Kbd>
</td>
<td>Add block below</td>
</tr>
<tr>
<td>Delete selected entry</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>↑</Kbd>
<Kbd>{deviceMod}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>B</Kbd>
<Kbd>⌫</Kbd>
</td>
<td>Add block above</td>
</tr>
<tr className={style.spacer} />
<tr>
<td>Add event below</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>D</Kbd>
<Kbd>E</Kbd>
</td>
<td>Add delay below</td>
</tr>
<tr>
<td>Add event above</td>
<td>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>↑</Kbd>
<AuxKey>+</AuxKey>
<Kbd>D</Kbd>
<Kbd>E</Kbd>
</td>
<td>Add delay above</td>
</tr>
<tr>
<td>Add block below</td>
<td>
<Kbd>Esc</Kbd>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>B</Kbd>
</td>
<td>Deselect entry</td>
</tr>
<tr>
<td>Add block above</td>
<td>
<Kbd>{deviceMod}</Kbd>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>⌫</Kbd>
<Kbd>↑</Kbd>
<AuxKey>+</AuxKey>
<Kbd>B</Kbd>
</td>
<td>Delete selected entry</td>
</tr>
<tr>
<td>Add delay below</td>
<td>
<Kbd>{deviceMod}</Kbd>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>C</Kbd>
<Kbd>D</Kbd>
</td>
<td>Copy selected entry</td>
</tr>
<tr>
<td>Add delay above</td>
<td>
<Kbd>{deviceMod}</Kbd>
<Kbd>{deviceAlt}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>↑</Kbd>
<AuxKey>+</AuxKey>
<Kbd>V</Kbd>
</td>
<td>Paste above</td>
</tr>
<tr>
<td>
<Kbd>{deviceMod}</Kbd>
<AuxKey>+</AuxKey>
<Kbd>V</Kbd>
<Kbd>D</Kbd>
</td>
<td>Paste below</td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down