Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix playlist view margins

Chocobozzz8c30e166c3a1
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
index dbf1b6df73..41cf655f7e 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
@@ -9,14 +9,11 @@
.playlist-info {
grid-column: 1;
- margin-top: -$sub-menu-margin-bottom;
-
- padding: 15px;
display: flex;
flex-direction: column;
- @include margin-left(calc(#{pvar(--x-margin-content)} * -1));
+ @include margin-right(1rem);
}
.playlist-buttons {
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss
index 79743babe2..bd8831d843 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss
@@ -86,7 +86,6 @@
}
.miniature-thumbnail {
- margin-top: 10px;
margin-bottom: 5px;
@include block-ratio($selector: '::ng-deep a');
diff --git a/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts b/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
index e8ed401392..a12a7b3b54 100644
--- a/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
+++ b/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
@@ -9,31 +9,27 @@ import { getTranscodingJobPriority } from '../../transcoding-priority.js'
import { AbstractJobBuilder } from './abstract-job-builder.js'
/**
- *
* Class to build transcoding job in the local job queue
- *
*/
type Payload = {
- Builder: new () => VODHLSTranscodingJobHandler
+ Builder: new() => VODHLSTranscodingJobHandler
options: Omit<Parameters<VODHLSTranscodingJobHandler['create']>[0], 'priority'>
} | {
- Builder: new () => VODAudioMergeTranscodingJobHandler
+ Builder: new() => VODAudioMergeTranscodingJobHandler
options: Omit<Parameters<VODAudioMergeTranscodingJobHandler['create']>[0], 'priority'>
-} |
-{
- Builder: new () => VODWebVideoTranscodingJobHandler
+} | {
+ Builder: new() => VODWebVideoTranscodingJobHandler
options: Omit<Parameters<VODWebVideoTranscodingJobHandler['create']>[0], 'priority'>
}
type PayloadWithPriority = Payload & { higherPriority?: boolean }
// eslint-disable-next-line max-len
-export class TranscodingRunnerJobBuilder extends AbstractJobBuilder <Payload> {
-
+export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<Payload> {
protected async createJobs (options: {
video: MVideo
- payloads: [ [ PayloadWithPriority ], ...(PayloadWithPriority[][]) ] // Array of sequential jobs to create that depend on parent job
+ payloads: [[PayloadWithPriority], ...(PayloadWithPriority[][])] // Array of sequential jobs to create that depend on parent job
user: MUserId | null
}): Promise<void> {
const { payloads, user } = options
@@ -63,7 +59,7 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder <Payload> {
}
}
- private async createJob (options: {
+ private createJob (options: {
payload: Payload
priority: number
dependsOnRunnerJob?: MRunnerJob