Skip to content

Commit 50a2010

Browse files
committed
Merge remote-tracking branch 'superfly/fix/directors-screen-icon-color-and-size' into bbc-release53
2 parents 46f8957 + 02b7a01 commit 50a2010

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

packages/webui/src/client/styles/countdown/director.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ $hold-status-color: $liveline-timecode-color;
227227
overflow: hidden;
228228
white-space: nowrap;
229229
padding-left: 0.2em;
230-
margin-top: 2.95vh;
230+
margin-top: 2.55vh;
231231
display: flex;
232232
align-items: top;
233233
}

packages/webui/src/client/ui/ClockView/ClockView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
4444
<DirectorScreen playlistId={playlist._id} studioId={studioId} />
4545
</RundownTimingProvider>
4646
) : (
47-
<StudioScreenSaver studioId={studioId} ownBackground={true} screenName={t('Director Screen')} />
47+
<StudioScreenSaver studioId={studioId} ownBackground={true} screenName={t("Director's Screen")} />
4848
)}
4949
</Route>
5050
<Route path="/countdowns/:studioId/overlay">

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22

33
// Variables
44
$text-color: #ffffff;
5-
$font-size-base: 21em;
5+
$font-size-base: 19.5em;
66
$text-shadow: 0 2px 9px rgba(0, 0, 0, 0.5);
77
$letter-spacing: 0.03em;
88

9+
$background-live-speak: linear-gradient(
10+
to bottom,
11+
$segment-layer-background-live-speak-1 74%,
12+
$segment-layer-background-live-speak-2 74%
13+
);
14+
15+
$background-remote-speak: linear-gradient(
16+
to bottom,
17+
$segment-layer-background-remote-speak-1 74%,
18+
$segment-layer-background-remote-speak-2 74%
19+
);
20+
921
@mixin layer-type-backgrounds {
1022
@each $layer-type in $layer-types {
1123
&.#{$layer-type} {
@@ -81,15 +93,19 @@ $letter-spacing: 0.03em;
8193
}
8294

8395
.live-speak {
84-
--vt-color-light: color-mix(in srgb, var(--segment-layer-background-#{'vt'}) 90%, white);
85-
--camera-color-light: color-mix(in srgb, var(--segment-layer-background-#{'camera'}) 90%, white);
86-
87-
background-image: linear-gradient(to bottom, var(--vt-color-light) 50%, var(--camera-color-light) 50%);
96+
background-image: $background-live-speak;
8897
display: flex;
8998
justify-content: center;
9099
align-items: center;
91100
}
92101

102+
.remote-speak {
103+
background-image: $background-remote-speak;
104+
display: flex;
105+
justify-content: center;
106+
align-items: center;
107+
}
108+
93109
// Split view container and layers
94110
.split-view {
95111
position: absolute;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
export function RemoteSpeakInputIcon({ abbreviation }: { abbreviation?: string }): JSX.Element {
22
return (
33
<div className="clock-view-piece-icon">
4-
<rect width="126.5" height="89" className="remote-speak" />
5-
<linearGradient id="background-gradient" gradientTransform="rotate(90)">
6-
<stop className="stop1" offset={0.5} />
7-
<stop className="stop2" offset={0.5} />
8-
</linearGradient>
94
<span className="remote-speak">{abbreviation !== undefined ? abbreviation : 'RSK'}</span>
105
</div>
116
)

0 commit comments

Comments
 (0)