diff --git a/packages/webui/src/client/styles/_colorScheme.scss b/packages/webui/src/client/styles/_colorScheme.scss index 43efdc541f..238d8949f1 100644 --- a/packages/webui/src/client/styles/_colorScheme.scss +++ b/packages/webui/src/client/styles/_colorScheme.scss @@ -1,4 +1,3 @@ -@import 'defaultColors'; // color variables are defined in defaultColors.scss diff --git a/packages/webui/src/client/styles/_robotoFont.scss b/packages/webui/src/client/styles/_robotoFont.scss index 30c56a12a2..29e8bba293 100644 --- a/packages/webui/src/client/styles/_robotoFont.scss +++ b/packages/webui/src/client/styles/_robotoFont.scss @@ -1,2 +1 @@ $FontPath: '../../fonts/roboto-gh-pages/fonts'; -@import 'fonts/roboto'; diff --git a/packages/webui/src/client/styles/_variables.scss b/packages/webui/src/client/styles/_variables.scss index b7b6df1117..cb28e89c2a 100644 --- a/packages/webui/src/client/styles/_variables.scss +++ b/packages/webui/src/client/styles/_variables.scss @@ -1,4 +1,3 @@ -@import 'colorScheme'; $fullscreen-controls__button--radius: 3.125rem; diff --git a/packages/webui/src/client/styles/externalMessagesStatus.scss b/packages/webui/src/client/styles/externalMessagesStatus.scss index 91c6d9dbd5..e37e895f99 100644 --- a/packages/webui/src/client/styles/externalMessagesStatus.scss +++ b/packages/webui/src/client/styles/externalMessagesStatus.scss @@ -1,4 +1,3 @@ -@import '_colorScheme'; .external-message-status { padding-bottom: 70vh; diff --git a/packages/webui/src/client/styles/main.scss b/packages/webui/src/client/styles/main.scss index 3538eafd6d..b30d3dfe2d 100644 --- a/packages/webui/src/client/styles/main.scss +++ b/packages/webui/src/client/styles/main.scss @@ -8,6 +8,9 @@ input { user-select: auto; } */ +@import 'defaultColors'; +@import 'itemTypeColors'; +@import 'colorScheme'; @import '_variables'; @import '_header'; @import '_colorScheme'; diff --git a/packages/webui/src/client/styles/notifications.scss b/packages/webui/src/client/styles/notifications.scss index d9f21cddc5..698a07cda2 100644 --- a/packages/webui/src/client/styles/notifications.scss +++ b/packages/webui/src/client/styles/notifications.scss @@ -1,5 +1,3 @@ -@import '_colorScheme'; -@import '_variables'; .notification-pop-ups { position: fixed; diff --git a/packages/webui/src/client/styles/rundownList.scss b/packages/webui/src/client/styles/rundownList.scss index 126e6eaf51..2630d9dadf 100644 --- a/packages/webui/src/client/styles/rundownList.scss +++ b/packages/webui/src/client/styles/rundownList.scss @@ -1,4 +1,3 @@ -@import '_colorScheme'; // Root playlist/rundown list, see RundownList.tsx .rundown-list { diff --git a/packages/webui/src/client/styles/rundownView.scss b/packages/webui/src/client/styles/rundownView.scss index 2db0a2c0b7..e6cf3bb719 100644 --- a/packages/webui/src/client/styles/rundownView.scss +++ b/packages/webui/src/client/styles/rundownView.scss @@ -1,7 +1,4 @@ -@import 'colorScheme'; -@import 'itemTypeColors'; @import 'utils'; -@import '_variables'; $output-layer-group-line: 1px solid #5c5c5c; $output-layer-group-collapse-animation-duration: 0.3s; diff --git a/packages/webui/src/client/styles/shelf/adLibPanel.scss b/packages/webui/src/client/styles/shelf/adLibPanel.scss index 3db5fe9e02..77cce2d306 100644 --- a/packages/webui/src/client/styles/shelf/adLibPanel.scss +++ b/packages/webui/src/client/styles/shelf/adLibPanel.scss @@ -1,5 +1,4 @@ @import '../colorScheme'; -@import '../itemTypeColors'; :root { --adlib-item-selected-color: #009dff; diff --git a/packages/webui/src/client/styles/shelf/dashboard-rundownView.scss b/packages/webui/src/client/styles/shelf/dashboard-rundownView.scss index ac9f6e63c0..9f1916782a 100644 --- a/packages/webui/src/client/styles/shelf/dashboard-rundownView.scss +++ b/packages/webui/src/client/styles/shelf/dashboard-rundownView.scss @@ -1,4 +1,3 @@ -@import '../_variables'; .rundown-view-shelf.dashboard-panel { width: auto; diff --git a/packages/webui/src/client/styles/shelf/dashboard.scss b/packages/webui/src/client/styles/shelf/dashboard.scss index 90d2bb1d0c..318cea09ae 100644 --- a/packages/webui/src/client/styles/shelf/dashboard.scss +++ b/packages/webui/src/client/styles/shelf/dashboard.scss @@ -1,5 +1,4 @@ @import '../colorScheme'; -@import '../itemTypeColors'; $dashboard-button-width: 6.40625em; $dashboard-button-height: 5.625em; diff --git a/packages/webui/src/client/styles/shelf/inspector.scss b/packages/webui/src/client/styles/shelf/inspector.scss index 4ab1fcaded..9a6221382f 100644 --- a/packages/webui/src/client/styles/shelf/inspector.scss +++ b/packages/webui/src/client/styles/shelf/inspector.scss @@ -1,5 +1,4 @@ @import '../colorScheme'; -@import '../itemTypeColors'; @import '../variables'; .shelf-inspector { diff --git a/packages/webui/src/client/styles/shelf/partNamePanel.scss b/packages/webui/src/client/styles/shelf/partNamePanel.scss index 7b315f9a26..8b0a8fe0f8 100644 --- a/packages/webui/src/client/styles/shelf/partNamePanel.scss +++ b/packages/webui/src/client/styles/shelf/partNamePanel.scss @@ -1,4 +1,3 @@ -@import '../itemTypeColors'; .part-name-panel { position: absolute; diff --git a/packages/webui/src/client/styles/splitDropdown.scss b/packages/webui/src/client/styles/splitDropdown.scss index 1891f4bd64..eaeb9736ef 100644 --- a/packages/webui/src/client/styles/splitDropdown.scss +++ b/packages/webui/src/client/styles/splitDropdown.scss @@ -1,4 +1,3 @@ -@import '_colorScheme'; .expco.button { border: 1px solid rgba(99, 99, 99, 0.5); diff --git a/packages/webui/src/client/styles/statusbar.scss b/packages/webui/src/client/styles/statusbar.scss index 122ddc32d4..2c222ed4e5 100644 --- a/packages/webui/src/client/styles/statusbar.scss +++ b/packages/webui/src/client/styles/statusbar.scss @@ -1,5 +1,3 @@ -@import '_colorScheme'; -@import '_variables'; .status-bar { position: fixed; diff --git a/packages/webui/src/client/styles/supportAndSwitchboardPanel.scss b/packages/webui/src/client/styles/supportAndSwitchboardPanel.scss index a7074e64da..00fed1913d 100644 --- a/packages/webui/src/client/styles/supportAndSwitchboardPanel.scss +++ b/packages/webui/src/client/styles/supportAndSwitchboardPanel.scss @@ -1,5 +1,3 @@ -@import '_colorScheme'; -@import '_variables'; .status-bar__controls__button.support__toggle-button { z-index: 310; diff --git a/packages/webui/src/client/styles/systemStatus.scss b/packages/webui/src/client/styles/systemStatus.scss index 536f5acaec..26d42cea3d 100644 --- a/packages/webui/src/client/styles/systemStatus.scss +++ b/packages/webui/src/client/styles/systemStatus.scss @@ -1,4 +1,3 @@ -@import '_colorScheme'; .status-dialog { overflow: visible !important; diff --git a/packages/webui/src/client/styles/users.scss b/packages/webui/src/client/styles/users.scss index 8cb77ca15c..ef2c573098 100644 --- a/packages/webui/src/client/styles/users.scss +++ b/packages/webui/src/client/styles/users.scss @@ -1,4 +1,3 @@ -@import '_variables'; .center-page { align-items: center; diff --git a/packages/webui/src/client/styles/utils.scss b/packages/webui/src/client/styles/utils.scss index a502293849..ec36088939 100644 --- a/packages/webui/src/client/styles/utils.scss +++ b/packages/webui/src/client/styles/utils.scss @@ -1,4 +1,3 @@ -@import '_variables'; @mixin take-arrow { content: ' '; diff --git a/packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss b/packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss index 35eda79db4..d693212db1 100644 --- a/packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss +++ b/packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss @@ -1,5 +1,4 @@ @import '../../../styles/variables'; -@import '../../../styles/itemTypeColors'; $page-margin: 1rem 1rem 0 3rem; diff --git a/packages/webui/src/client/ui/PieceIcons/IconColors.scss b/packages/webui/src/client/ui/PieceIcons/IconColors.scss index 8a129c4e1e..1aaae81f62 100644 --- a/packages/webui/src/client/ui/PieceIcons/IconColors.scss +++ b/packages/webui/src/client/ui/PieceIcons/IconColors.scss @@ -1,4 +1,3 @@ -@import '../../styles/_itemTypeColors'; svg.piece_icon { @include item-type-colors-svg(); diff --git a/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss index 36b0925a2b..76efdacf31 100644 --- a/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss +++ b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss @@ -1,5 +1,4 @@ @import '../../../styles/colorScheme'; -@import '../../../styles/itemTypeColors'; .media-status-popup-item { .media-status-popup-item__playout-indicator { diff --git a/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss b/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss index baa5dd0821..1dfd257700 100644 --- a/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss +++ b/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss @@ -1,4 +1,3 @@ -@import '../../../styles/itemTypeColors'; .segment-opl__main-piece { position: relative; diff --git a/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss index 0cd9dc8cd5..544e8979be 100644 --- a/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss +++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss @@ -1,4 +1,3 @@ -@import '../../../styles/itemTypeColors'; .segment-opl__piece-indicator-placeholder { position: relative; diff --git a/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss index 76fce05b2e..99e2d83755 100644 --- a/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss +++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss @@ -1,4 +1,3 @@ -@import '../../../styles/itemTypeColors'; .segment-opl__piece-indicator-menu { background: #5a5a5a; diff --git a/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss b/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss index b8b3785260..b467e304ba 100644 --- a/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss +++ b/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss @@ -1,4 +1,3 @@ -@import '../../../styles/itemTypeColors'; .segment-opl__secondary-piece { position: absolute; diff --git a/packages/webui/src/client/ui/SegmentList/SegmentList.scss b/packages/webui/src/client/ui/SegmentList/SegmentList.scss index d52ccad341..96f6b07e03 100644 --- a/packages/webui/src/client/ui/SegmentList/SegmentList.scss +++ b/packages/webui/src/client/ui/SegmentList/SegmentList.scss @@ -1,7 +1,5 @@ @import '../../styles/colorScheme'; @import '../../styles/utils'; -@import '../../styles/variables'; -@import '../../styles/itemTypeColors'; /** Loans from rundownView.scss, to be refactored to a shared variable file */ $segment-title-background-color: #4b4b4b; diff --git a/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss index d48c116579..386026145c 100644 --- a/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss +++ b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss @@ -1,7 +1,6 @@ @import '../../styles/colorScheme'; @import '../../styles/utils'; @import '../../styles/variables'; -@import '../../styles/itemTypeColors'; $part-left-padding: 6px; $part-right-padding: 5px; diff --git a/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss index b11e4eb76c..540becce14 100644 --- a/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss +++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss @@ -1,4 +1,3 @@ -@import '../../../styles/itemTypeColors'; $source-layer-height: 1.2rem; $source-layer-margin: 0.2rem; diff --git a/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss index a604ebce52..f02b3b013f 100644 --- a/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss +++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss @@ -1,5 +1,4 @@ @import '../../../styles/variables'; -@import '../../../styles/itemTypeColors'; .segment-storyboard__part__thumbnail { @include item-type-colors(); diff --git a/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss index cee4ed9e01..1936e7e08e 100644 --- a/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss +++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss @@ -1,4 +1,3 @@ -@import '../../../../styles/itemTypeColors'; @import '../../../../styles/colorScheme'; $triggered-action-color: #146985; diff --git a/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss b/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss index 927221c890..37b3d645d7 100644 --- a/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss +++ b/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss @@ -1,5 +1,4 @@ @import '../../../styles/colorScheme'; -@import '../../../styles/itemTypeColors'; .media-status-item:nth-child(2n + 1) > td { background: #f6f6f6;