Skip to content

Commit 3357e7a

Browse files
committed
wip: diffirentiate css between pieceIcons and ClockView Piece icons
1 parent af1a642 commit 3357e7a

File tree

10 files changed

+61
-68
lines changed

10 files changed

+61
-68
lines changed

packages/webui/src/client/styles/main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ input {
103103
@import '../ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss';
104104
@import '../ui/PieceIcons/IconColors.scss';
105105
@import '../ui/PieceIcons/PieceIcons';
106+
@import '../ui/ClockView/ClockViewPieceIcons/ClockViewPieceIcons';
106107
@import '../ui/ClockView/CameraScreen/CameraScreen.scss';
107108
@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss';
108109
@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss';

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewIconColors.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewPieceIcons.scss

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,63 @@ $text-shadow: 0 2px 9px rgba(0, 0, 0, 0.5);
55
$letter-spacing: 0.02em;
66

77
@mixin layer-type-backgrounds {
8-
@each $layer-type in $layer-types {
9-
&.#{$layer-type} {
10-
// Background:
11-
display: inline-block;
12-
width: 207px;
13-
height: 126px;
14-
line-height: 126px;
8+
@each $layer-type in $layer-types {
9+
&.#{$layer-type} {
10+
// Background:
11+
display: inline-block;
12+
width: 207px;
13+
height: 126px;
14+
line-height: 126px;
1515

16-
background-color: var(--segment-layer-background-#{$layer-type});
17-
18-
&.second {
19-
background-color: var(--segment-layer-background-#{$layer-type}--second);
20-
}
21-
}
22-
}
16+
background-color: var(--segment-layer-background-#{$layer-type});
17+
18+
&.second {
19+
background-color: var(--segment-layer-background-#{$layer-type}--second);
20+
}
21+
}
22+
}
2323
}
2424

2525
// Base icon styles
26-
.piece-icon {
27-
// Text styles:
28-
fill: $text-color;
29-
font-family: Roboto Flex;
30-
filter: drop-shadow($text-shadow);
31-
font-size: $font-size-base;
32-
font-weight: 300;
33-
letter-spacing: $letter-spacing;
26+
.clock-view-piece-icon {
27+
// Text styles:
28+
fill: $text-color;
29+
font-family: Roboto Flex;
30+
filter: drop-shadow($text-shadow);
31+
font-size: $font-size-base;
32+
font-weight: 300;
33+
letter-spacing: $letter-spacing;
3434

35-
span {
36-
// Common styles
37-
@include layer-type-backgrounds; // Apply to all span elements that have layer type classes
38-
}
35+
span {
36+
// Common styles
37+
@include layer-type-backgrounds; // Apply to all span elements that have layer type classes
38+
}
3939

40-
.live-speak {
41-
fill: url(#background-gradient);
42-
}
40+
.live-speak {
41+
fill: url(#background-gradient);
42+
}
4343

44-
// Gradient styles for live-speak
45-
#background-gradient {
46-
.stop1 {
47-
stop-color: #954c4c;
48-
}
49-
.stop2 {
50-
stop-color: #4c954c;
51-
}
52-
}
44+
// Gradient styles for live-speak
45+
#background-gradient {
46+
.stop1 {
47+
stop-color: #954c4c;
48+
}
49+
.stop2 {
50+
stop-color: #4c954c;
51+
}
52+
}
5353

54-
// Split view specific styles
55-
.upper, .lower {
56-
57-
&.camera {
58-
@include item-type-colors-svg();
59-
}
60-
&.remote {
61-
@include item-type-colors-svg();
62-
}
63-
&.remote.second {
64-
@include item-type-colors-svg();
65-
}
66-
}
67-
}
54+
// Split view specific styles
55+
.upper,
56+
.lower {
57+
&.camera {
58+
@include item-type-colors-svg();
59+
}
60+
&.remote {
61+
@include item-type-colors-svg();
62+
}
63+
&.remote.second {
64+
@include item-type-colors-svg();
65+
}
66+
}
67+
}

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/CamInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function CamInputIcon({
77
abbreviation?: string
88
}): JSX.Element {
99
return (
10-
<div className="piece-icon">
10+
<div className="clock-view-piece-icon">
1111
<span className="camera">
1212
{abbreviation !== undefined ? abbreviation : 'C'}
1313
{inputIndex !== undefined ? inputIndex : ''}

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/GraphicsInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function GraphicsInputIcon({ abbreviation }: { abbreviation?: string }): JSX.Element {
22
return (
3-
<div className="piece-icon">
3+
<div className="clock-view-piece-icon">
44
<span className="graphics">{abbreviation !== undefined ? abbreviation : 'G'}</span>
55
</div>
66
)

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/LiveSpeakInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function LiveSpeakInputIcon({ abbreviation }: { abbreviation?: string }): JSX.Element {
22
return (
3-
<div className="piece-icon">
3+
<div className="clock-view-piece-icon">
44
<span className="live-speak">{abbreviation !== undefined ? abbreviation : 'LSK'}</span>
55
</div>
66
)

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/RemoteInputIcon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22

33
export function BaseRemoteInputIcon(props: Readonly<React.PropsWithChildren<{ className: string }>>): JSX.Element {
4-
return <div className="piece-icon">{props.children}</div>
4+
return <div className="clock-view-piece-icon">{props.children}</div>
55
}
66

77
export function RemoteInputIcon({
@@ -12,7 +12,7 @@ export function RemoteInputIcon({
1212
abbreviation?: string
1313
}): JSX.Element {
1414
return (
15-
<BaseRemoteInputIcon className="piece-icon">
15+
<BaseRemoteInputIcon className="clock-view-piece-icon">
1616
<span className="remote">
1717
{abbreviation !== undefined ? abbreviation : 'LIVE'}
1818
{inputIndex ?? ''}

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/SplitInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default class SplitInputIcon extends React.Component<{
5454
render(): JSX.Element {
5555
return (
5656
<svg
57-
className="piece-icon"
57+
className="clock-view-piece-icon"
5858
version="1.1"
5959
viewBox="0 0 126.5 89"
6060
xmlns="http://www.w3.org/2000/svg"

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/UnknownInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function UnknownInputIcon(): JSX.Element {
22
return (
3-
<div className="piece-icon">
3+
<div className="clock-view-piece-icon">
44
<span className="unknown">?</span>
55
</div>
66
)

packages/webui/src/client/ui/ClockView/ClockViewPieceIcons/ClockViewRenderers/VTInputIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function VTInputIcon({ abbreviation }: { abbreviation?: string }): JSX.Element {
22
return (
3-
<div className="piece-icon">
3+
<div className="clock-view-piece-icon">
44
<span className="vt">{abbreviation !== undefined ? abbreviation : 'VT'}</span>
55
</div>
66
)

0 commit comments

Comments
 (0)