Skip to content

Commit

Permalink
fix(FEC-8778): no watermark is shown in pre-play presentation (#319)
Browse files Browse the repository at this point in the history
Move the watermark and the playlist-countdown outside the player gui and set the css on the playlist countdown which is applied automatically while it was under the player gui.
  • Loading branch information
Dan Ziv committed Dec 20, 2018
1 parent fcd1fc2 commit bc23ee4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/components/playlist-countdown/_playlist-countdown.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.player {

.playlist-countdown {
font-family: $font-family;
height: 72px;
position: absolute;
bottom: 0;
Expand All @@ -12,6 +13,7 @@

&.hidden {
right: -160px;
pointer-events: none;
opacity: 0;
.playlist-countdown-content-placeholder {
.playlist-countdown-content-background {
Expand Down
2 changes: 1 addition & 1 deletion src/ui-presets/live.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export function liveUI(props: any): React$Element<any> {
<UnmuteIndication />
<OverlayAction player={props.player} />
<PlaybackControls player={props.player} />
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
<BottomBar>
<SeekBarLivePlaybackContainer showFramePreview showTimeBubble player={props.player} playerContainer={props.playerContainer} />
<div className={style.leftControls}>
Expand All @@ -57,6 +56,7 @@ export function liveUI(props: any): React$Element<any> {
</div>
</BottomBar>
</div>
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
<PrePlaybackPlayOverlay player={props.player} />
<CastBeforePlay player={props.player} />
<Backdrop />
Expand Down
4 changes: 2 additions & 2 deletions src/ui-presets/playback.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export function playbackUI(props: any): React$Element<any> {
<OverlayAction player={props.player} />
<PlaybackControls player={props.player} />
{PlaylistNextScreen.shouldRender(props) ? <PlaylistNextScreen player={props.player} /> : undefined}
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
<BottomBar>
<SeekBarPlaybackContainer showFramePreview showTimeBubble player={props.player} playerContainer={props.playerContainer} />
<div className={style.leftControls}>
Expand All @@ -61,8 +60,9 @@ export function playbackUI(props: any): React$Element<any> {
<FullscreenControl player={props.player} />
</div>
</BottomBar>
{PlaylistCountdown.shouldRender(props) ? <PlaylistCountdown player={props.player} /> : undefined}
</div>
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
{PlaylistCountdown.shouldRender(props) ? <PlaylistCountdown player={props.player} /> : undefined}
<PrePlaybackPlayOverlay player={props.player} />
<CastBeforePlay player={props.player} />
<Backdrop />
Expand Down

0 comments on commit bc23ee4

Please sign in to comment.