Skip to content
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

Added label on the next autoplayed video and hide the hr line if unnecessary #4497

Merged
merged 5 commits into from
Oct 26, 2021
Merged

Added label on the next autoplayed video and hide the hr line if unnecessary #4497

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a708f37
Added label on the next autoplayed video
Poslovitch Oct 25, 2021
db297ea
Merge branch 'Chocobozzz:develop' into feature/4280/hr-autoplay-next
Poslovitch Oct 26, 2021
2f6f222
Applied code suggestion
Poslovitch Oct 26, 2021
3edf66d
Applied code suggestion
Poslovitch Oct 26, 2021
af2eaec
Applied the last remaining code suggestion
Poslovitch Oct 26, 2021
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
3 changes: 2 additions & 1 deletion client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ <h2 i18n class="title-page title-page-single">
</div>

<ng-container *ngFor="let video of (videos$ | async); let i = index; let length = count">
<span i18n *ngIf="!playlist && i === 0 && length > 1 && autoPlayNextVideo" class="title-page-next-video-label">Next video to be played</span>
<my-video-miniature
[displayOptions]="displayOptions" [video]="video" [user]="userMiniature" [displayAsRow]="displayAsRow"
(videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()" (videoAccountMuted)="onVideoRemoved()"
actorImageSize="32"
>
</my-video-miniature>

<hr *ngIf="!playlist && i === 0 && length > 1" />
<hr *ngIf="!playlist && i === 0 && length > 1 && autoPlayNextVideo" />
</ng-container>
</ng-container>
</div>
5 changes: 5 additions & 0 deletions client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
}
}

.title-page-next-video-label {
margin-bottom: 5px;
font-weight: $font-semibold;
}

hr {
margin-top: 0;
}
Expand Down