From 8ad1f2cb385764ace14788a6a454790019aa5a75 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Mon, 28 Oct 2024 22:10:40 +0100 Subject: [PATCH] refactor: no style overrides in production views --- apps/client/src/features/cuesheet/Cuesheet.tsx | 2 +- .../operator/operator-event/OperatorEvent.module.scss | 6 +++--- apps/server/src/user/styles/override.css | 9 +-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/apps/client/src/features/cuesheet/Cuesheet.tsx b/apps/client/src/features/cuesheet/Cuesheet.tsx index 3df5eb241..deaf586e5 100644 --- a/apps/client/src/features/cuesheet/Cuesheet.tsx +++ b/apps/client/src/features/cuesheet/Cuesheet.tsx @@ -140,7 +140,7 @@ export default function Cuesheet({ data, columns, handleUpdate, selectedId, curr let rowBgColour: string | undefined; if (isSelected) { - rowBgColour = 'var(--cuesheet-running-bg-override, #D20300)'; // $red-700 + rowBgColour = '#D20300'; // $red-700 } else if (row.original.colour) { try { // the colour is user defined and might be invalid diff --git a/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss b/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss index efc78c670..f9c768374 100644 --- a/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss +++ b/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss @@ -30,7 +30,7 @@ &.running { border-top: 1px solid $gray-1300; - background-color: var(--operator-running-bg-override, $active-red); + background-color: $active-red; } &.past { @@ -105,7 +105,7 @@ } .noColour { - outline: 0.15rem solid var(--operator-highlight-override, $ui-white); + outline: 0.15rem solid $ui-white; outline-offset: -0.15rem; padding-right: 0.3rem; color: $ui-white; @@ -114,7 +114,7 @@ .value { padding-inline: 0.25rem; background-color: $gray-1250; - color: var(--operator-highlight-override, $ui-white); + color: $ui-white; margin-right: 1rem; } } diff --git a/apps/server/src/user/styles/override.css b/apps/server/src/user/styles/override.css index 6edafca25..ef02a5347 100644 --- a/apps/server/src/user/styles/override.css +++ b/apps/server/src/user/styles/override.css @@ -43,14 +43,7 @@ /** Colour used for external message and aux timer in /timer */ --external-color-override: #161616; - - /** View specific features: /cuesheet */ - --cuesheet-running-bg-override: #D20300; - - /** View specific features: /op */ - --operator-running-bg-override: #D20300; - --operator-highlight-override: #FFAB33; - + /** View specific features: /studio */ --studio-active: #101010; --studio-idle: #cfcfcf;