fix: the scss structure was reimporting colors and variable multiple places. This is now replaced to be only in main.scss

olzzon · olzzon · commit 8b926ac23a92 · 2024-12-04T10:55:52.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 @import '../../../styles/colorScheme';
-@import '../../../styles/itemTypeColors';
 
 .media-status-item:nth-child(2n + 1) > td {
 	background: #f6f6f6;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import 'defaultColors';`
`2`	`1`
`3`	`2`	`// color variables are defined in defaultColors.scss`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`$FontPath: '../../fonts/roboto-gh-pages/fonts';`
`2`		`-@import 'fonts/roboto';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import 'colorScheme';`
`2`	`1`
`3`	`2`	`$fullscreen-controls__button--radius: 3.125rem;`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import '_colorScheme';`
`2`	`1`
`3`	`2`	`.external-message-status {`
`4`	`3`	`padding-bottom: 70vh;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-@import '_colorScheme';`
`2`		`-@import '_variables';`
`3`	`1`
`4`	`2`	`.notification-pop-ups {`
`5`	`3`	`position: fixed;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import '_colorScheme';`
`2`	`1`
`3`	`2`	`// Root playlist/rundown list, see RundownList.tsx`
`4`	`3`	`.rundown-list {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@import '../colorScheme';`
`2`		`-@import '../itemTypeColors';`
`3`	`2`
`4`	`3`	`:root {`
`5`	`4`	`--adlib-item-selected-color: #009dff;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import '../_variables';`
`2`	`1`
`3`	`2`	`.rundown-view-shelf.dashboard-panel {`
`4`	`3`	`width: auto;`