diff options
Diffstat (limited to 'client/src/app')
5 files changed, 25 insertions, 5 deletions
diff --git a/client/src/app/+videos/+video-watch/player-styles.component.scss b/client/src/app/+videos/+video-watch/player-styles.component.scss new file mode 100644 index 000000000..7f1442a59 --- /dev/null +++ b/client/src/app/+videos/+video-watch/player-styles.component.scss | |||
@@ -0,0 +1,4 @@ | |||
1 | @import 'node_modules/video.js/dist/video-js'; | ||
2 | |||
3 | $assets-path: '../../assets/'; | ||
4 | @import '../../../sass/player/index'; | ||
diff --git a/client/src/app/+videos/+video-watch/player-styles.component.ts b/client/src/app/+videos/+video-watch/player-styles.component.ts new file mode 100644 index 000000000..c02630979 --- /dev/null +++ b/client/src/app/+videos/+video-watch/player-styles.component.ts | |||
@@ -0,0 +1,14 @@ | |||
1 | import { Component, ViewEncapsulation } from '@angular/core' | ||
2 | |||
3 | /* | ||
4 | * Allows to lazy load global player styles in the watch component | ||
5 | */ | ||
6 | |||
7 | @Component({ | ||
8 | selector: 'my-player-styles', | ||
9 | template: '', | ||
10 | styleUrls: [ './player-styles.component.scss' ], | ||
11 | encapsulation: ViewEncapsulation.None | ||
12 | }) | ||
13 | export class PlayerStylesComponent { | ||
14 | } | ||
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 6ede109fd..eadb2148a 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html | |||
@@ -319,3 +319,5 @@ | |||
319 | <my-support-modal #supportModal [video]="video"></my-support-modal> | 319 | <my-support-modal #supportModal [video]="video"></my-support-modal> |
320 | <my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions" [playlist]="playlist"></my-video-share> | 320 | <my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions" [playlist]="playlist"></my-video-share> |
321 | </ng-container> | 321 | </ng-container> |
322 | |||
323 | <my-player-styles></my-player-styles> | ||
diff --git a/client/src/app/+videos/+video-watch/video-watch.module.ts b/client/src/app/+videos/+video-watch/video-watch.module.ts index 3e9f3822e..29ad92f00 100644 --- a/client/src/app/+videos/+video-watch/video-watch.module.ts +++ b/client/src/app/+videos/+video-watch/video-watch.module.ts | |||
@@ -14,6 +14,7 @@ import { VideoCommentService } from '../../shared/shared-video-comment/video-com | |||
14 | import { VideoCommentAddComponent } from './comment/video-comment-add.component' | 14 | import { VideoCommentAddComponent } from './comment/video-comment-add.component' |
15 | import { VideoCommentComponent } from './comment/video-comment.component' | 15 | import { VideoCommentComponent } from './comment/video-comment.component' |
16 | import { VideoCommentsComponent } from './comment/video-comments.component' | 16 | import { VideoCommentsComponent } from './comment/video-comments.component' |
17 | import { PlayerStylesComponent } from './player-styles.component' | ||
17 | import { RecommendationsModule } from './recommendations/recommendations.module' | 18 | import { RecommendationsModule } from './recommendations/recommendations.module' |
18 | import { TimestampRouteTransformerDirective } from './timestamp-route-transformer.directive' | 19 | import { TimestampRouteTransformerDirective } from './timestamp-route-transformer.directive' |
19 | import { VideoAvatarChannelComponent } from './video-avatar-channel.component' | 20 | import { VideoAvatarChannelComponent } from './video-avatar-channel.component' |
@@ -50,7 +51,8 @@ import { VideoWatchComponent } from './video-watch.component' | |||
50 | VideoAvatarChannelComponent, | 51 | VideoAvatarChannelComponent, |
51 | 52 | ||
52 | TimestampRouteTransformerDirective, | 53 | TimestampRouteTransformerDirective, |
53 | TimestampRouteTransformerDirective | 54 | |
55 | PlayerStylesComponent | ||
54 | ], | 56 | ], |
55 | 57 | ||
56 | exports: [ | 58 | exports: [ |
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index 42293e412..7e9e4a216 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss | |||
@@ -3,8 +3,6 @@ | |||
3 | @import '~bootstrap/scss/functions'; | 3 | @import '~bootstrap/scss/functions'; |
4 | @import '~bootstrap/scss/variables'; | 4 | @import '~bootstrap/scss/variables'; |
5 | 5 | ||
6 | $assets-path: '../assets'; | ||
7 | |||
8 | .peertube-container { | 6 | .peertube-container { |
9 | padding-bottom: 20px; | 7 | padding-bottom: 20px; |
10 | } | 8 | } |
@@ -41,9 +39,9 @@ $assets-path: '../assets'; | |||
41 | 39 | ||
42 | &.icon-menu { | 40 | &.icon-menu { |
43 | background-color: pvar(--mainForegroundColor); | 41 | background-color: pvar(--mainForegroundColor); |
44 | mask-image: url('#{$assets-path}/images/misc/menu.svg'); | 42 | mask-image: url('../assets/images/misc/menu.svg'); |
45 | margin: 0 18px 0 20px; | 43 | margin: 0 18px 0 20px; |
46 | 44 | ||
47 | @media screen and (max-width: $mobile-view) { | 45 | @media screen and (max-width: $mobile-view) { |
48 | margin: 0 10px; | 46 | margin: 0 10px; |
49 | } | 47 | } |