From b2731bff2834fb6aacf166cf435030bf96eb12f3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Dec 2017 14:41:59 +0100 Subject: Small style fixes --- .../app/videos/+video-watch/video-watch.component.scss | 15 ++++++++++----- .../src/app/videos/+video-watch/video-watch.component.ts | 8 ++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'client/src/app/videos/+video-watch') diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 52082944a..e742e1329 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -43,12 +43,15 @@ align-items: center; .video-info-name { + margin-right: 30px; font-size: 27px; font-weight: $font-semibold; flex-grow: 1; } .video-info-actions { + min-width: 215px; + .action-button { @include peertube-button; @include grey-button; @@ -219,16 +222,12 @@ } -@media screen and (max-width: 1000px) { +@media screen and (max-width: 1200px) { .other-videos { display: none; } -} -@media screen and (max-width: 800px) { .video-bottom { - margin: 20px 0 0 0; - .video-info { margin-right: 0; @@ -250,3 +249,9 @@ } } } + +@media screen and (max-width: 800px) { + .video-bottom { + margin: 20px 0 0 0; + } +} diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 3825e8449..5e4823c9c 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -60,6 +60,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private markdownService: MarkdownService ) {} + get user () { + return this.authService.getUser() + } + ngOnInit () { this.videoService.getVideos({ currentPage: 1, itemsPerPage: 5 }, '-createdAt') .subscribe( @@ -204,7 +208,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } isVideoBlacklistable () { - return this.video.isBlackistableBy(this.authService.getUser()) + return this.video.isBlackistableBy(this.user) } getAvatarPath () { @@ -264,7 +268,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.video = video let observable - if (this.video.isVideoNSFWForUser(this.authService.getUser())) { + if (this.video.isVideoNSFWForUser(this.user)) { observable = this.confirmService.confirm( 'This video contains mature or explicit content. Are you sure you want to watch it?', 'Mature or explicit content' -- cgit v1.2.3