From 27dcf06c73cf4cebb25a0e7b90fe8dc5995e83a9 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Tue, 25 Mar 2025 08:53:08 +0100 Subject: [PATCH] refactor: clearer relationship on rundown elements --- apps/client/src/features/rundown/Rundown.module.scss | 2 +- apps/client/src/features/rundown/RundownExport.module.scss | 2 +- apps/client/src/features/rundown/_blockMixins.scss | 6 ------ .../src/features/rundown/block-block/BlockBlock.module.scss | 2 -- .../src/features/rundown/delay-block/DelayBlock.module.scss | 3 +-- .../rundown/quick-add-block/QuickAddBlock.module.scss | 1 - .../rundown/rundown-header/RundownHeader.module.scss | 2 +- 7 files changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/client/src/features/rundown/Rundown.module.scss b/apps/client/src/features/rundown/Rundown.module.scss index 93fcce5c5..8573fbb23 100644 --- a/apps/client/src/features/rundown/Rundown.module.scss +++ b/apps/client/src/features/rundown/Rundown.module.scss @@ -7,7 +7,6 @@ margin-top: 1rem; display: flex; flex-direction: column; - padding-right: 4px; // size of scrollbar overflow-y: scroll; height: 100%; } @@ -16,6 +15,7 @@ overflow-x: clip; display: flex; flex-direction: column; + padding-inline: 1rem; } .empty { diff --git a/apps/client/src/features/rundown/RundownExport.module.scss b/apps/client/src/features/rundown/RundownExport.module.scss index 957d482c4..5a2f8b4dd 100644 --- a/apps/client/src/features/rundown/RundownExport.module.scss +++ b/apps/client/src/features/rundown/RundownExport.module.scss @@ -25,7 +25,7 @@ .list { @include editor.panel; height: inherit; - padding-left: 0; + padding-inline: 0; box-shadow: $box-shadow-right; flex: 1 2 auto; /* flex-grow: 1, flex-shrink: 2, flex-basis: auto */ diff --git a/apps/client/src/features/rundown/_blockMixins.scss b/apps/client/src/features/rundown/_blockMixins.scss index 079249364..8f769edb3 100644 --- a/apps/client/src/features/rundown/_blockMixins.scss +++ b/apps/client/src/features/rundown/_blockMixins.scss @@ -21,18 +21,12 @@ $block-cursor-color: $orange-400; border: 1px solid $white-7; border-radius: $block-border-radius; margin-block: 0.25rem; - margin-right: 0.125rem; position: relative; color: $block-text-color; min-width: $block-width; } -@mixin block-spacing() { - padding-right: 0.5rem; - gap: 2px; -} - @mixin drag-style() { font-size: 20px; justify-self: center; diff --git a/apps/client/src/features/rundown/block-block/BlockBlock.module.scss b/apps/client/src/features/rundown/block-block/BlockBlock.module.scss index b5d6345a6..92d8e6526 100644 --- a/apps/client/src/features/rundown/block-block/BlockBlock.module.scss +++ b/apps/client/src/features/rundown/block-block/BlockBlock.module.scss @@ -1,9 +1,7 @@ @use '../blockMixins' as *; .block { - @include block-spacing; @include block-styling; - margin-left: 0.5rem; background-color: $block-bg2; diff --git a/apps/client/src/features/rundown/delay-block/DelayBlock.module.scss b/apps/client/src/features/rundown/delay-block/DelayBlock.module.scss index 094e801a4..0b93a38e6 100644 --- a/apps/client/src/features/rundown/delay-block/DelayBlock.module.scss +++ b/apps/client/src/features/rundown/delay-block/DelayBlock.module.scss @@ -1,11 +1,10 @@ @use '../blockMixins' as *; .delay { - @include block-spacing; @include block-styling; - margin-left: 0.5rem; background-color: $block-bg2; + padding-right: 0.5rem; display: grid; grid-template-columns: 2rem 1fr auto; diff --git a/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.module.scss b/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.module.scss index e41399099..a3fa9aec6 100644 --- a/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.module.scss +++ b/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.module.scss @@ -5,7 +5,6 @@ margin: 0.25rem 0; font-size: calc(1rem - 3px); - padding-inline: calc(2em + 0.5rem) 0.75rem; } .quickBtn { diff --git a/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss b/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss index fa551849b..a46635d28 100644 --- a/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss +++ b/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss @@ -1,5 +1,5 @@ .header { - padding-inline: calc(2rem - 6px + 0.5rem) calc(1rem + 2px); + padding-inline: 1rem 2rem; display: flex; align-items: center;