Skip to content

fix: the scss structure reimporting multiple times #1335

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

Merged
jstarpl merged 1 commit into from
Dec 9, 2024
Merged

fix: the scss structure reimporting multiple times #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/_colorScheme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'defaultColors';

// color variables are defined in defaultColors.scss

Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/_robotoFont.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
$FontPath: '../../fonts/roboto-gh-pages/fonts';
@import 'fonts/roboto';
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'colorScheme';

$fullscreen-controls__button--radius: 3.125rem;

Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/externalMessagesStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_colorScheme';

.external-message-status {
padding-bottom: 70vh;
Expand Down
3 changes: 3 additions & 0 deletions packages/webui/src/client/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ input {
user-select: auto;
} */

@import 'defaultColors';
@import 'itemTypeColors';
@import 'colorScheme';
@import '_variables';
@import '_header';
@import '_colorScheme';
Expand Down
2 changes: 0 additions & 2 deletions packages/webui/src/client/styles/notifications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '_colorScheme';
@import '_variables';

.notification-pop-ups {
position: fixed;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/rundownList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_colorScheme';

// Root playlist/rundown list, see RundownList.tsx
.rundown-list {
Expand Down
3 changes: 0 additions & 3 deletions packages/webui/src/client/styles/rundownView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/shelf/adLibPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../colorScheme';
@import '../itemTypeColors';

:root {
--adlib-item-selected-color: #009dff;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/shelf/dashboard-rundownView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../_variables';

.rundown-view-shelf.dashboard-panel {
width: auto;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/shelf/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../colorScheme';
@import '../itemTypeColors';

$dashboard-button-width: 6.40625em;
$dashboard-button-height: 5.625em;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/shelf/inspector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../colorScheme';
@import '../itemTypeColors';
@import '../variables';

.shelf-inspector {
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/shelf/partNamePanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../itemTypeColors';

.part-name-panel {
position: absolute;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/splitDropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_colorScheme';

.expco.button {
border: 1px solid rgba(99, 99, 99, 0.5);
Expand Down
2 changes: 0 additions & 2 deletions packages/webui/src/client/styles/statusbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '_colorScheme';
@import '_variables';

.status-bar {
position: fixed;
Expand Down
2 changes: 0 additions & 2 deletions packages/webui/src/client/styles/supportAndSwitchboardPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '_colorScheme';
@import '_variables';

.status-bar__controls__button.support__toggle-button {
z-index: 310;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/systemStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_colorScheme';

.status-dialog {
overflow: visible !important;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/users.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_variables';

.center-page {
align-items: center;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/styles/utils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '_variables';

@mixin take-arrow {
content: ' ';
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../../styles/variables';
@import '../../../styles/itemTypeColors';

$page-margin: 1rem 1rem 0 3rem;

Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/PieceIcons/IconColors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../styles/_itemTypeColors';

svg.piece_icon {
@include item-type-colors-svg();
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../../styles/colorScheme';
@import '../../../styles/itemTypeColors';

.media-status-popup-item {
.media-status-popup-item__playout-indicator {
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../styles/itemTypeColors';

.segment-opl__main-piece {
position: relative;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../styles/itemTypeColors';

.segment-opl__piece-indicator-placeholder {
position: relative;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../styles/itemTypeColors';

.segment-opl__piece-indicator-menu {
background: #5a5a5a;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../styles/itemTypeColors';

.segment-opl__secondary-piece {
position: absolute;
Expand Down
2 changes: 0 additions & 2 deletions packages/webui/src/client/ui/SegmentList/SegmentList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import '../../styles/colorScheme';
@import '../../styles/utils';
@import '../../styles/variables';
@import '../../styles/itemTypeColors';

$part-left-padding: 6px;
$part-right-padding: 5px;
Expand Down
1 change: 0 additions & 1 deletion ...ent/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../styles/itemTypeColors';

$source-layer-height: 1.2rem;
$source-layer-margin: 0.2rem;
Expand Down
1 change: 0 additions & 1 deletion ...ebui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../../styles/variables';
@import '../../../styles/itemTypeColors';

.segment-storyboard__part__thumbnail {
@include item-type-colors();
Expand Down
1 change: 0 additions & 1 deletion ...ages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '../../../../styles/itemTypeColors';
@import '../../../../styles/colorScheme';

$triggered-action-color: #146985;
Expand Down
1 change: 0 additions & 1 deletion packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../../styles/colorScheme';
@import '../../../styles/itemTypeColors';

.media-status-item:nth-child(2n + 1) > td {
background: #f6f6f6;
Expand Down
Loading