From 72675ebe0181ab2389fb2f75a3b2acdca6e09c07 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 13 May 2019 11:18:24 +0200 Subject: Move video watch playlist in its own component --- .../videos/+video-watch/video-watch.component.scss | 66 ++-------------------- 1 file changed, 6 insertions(+), 60 deletions(-) (limited to 'client/src/app/videos/+video-watch/video-watch.component.scss') 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 d8113b666..8ca5c4118 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -15,10 +15,10 @@ $player-factor: 1.7; // 16/9 } @mixin playlist-below-player { - width: 100%; - height: auto; - max-height: 300px; - border-bottom: 1px solid $separator-border-color; + width: 100% !important; + height: auto !important; + max-height: 300px !important; + border-bottom: 1px solid $separator-border-color !important; } .root { @@ -37,7 +37,7 @@ $player-factor: 1.7; // 16/9 width: 100%; } - .playlist { + my-video-watch-playlist /deep/ .playlist { @include playlist-below-player; } } @@ -80,60 +80,6 @@ $player-factor: 1.7; // 16/9 } } - .playlist { - min-width: 200px; - max-width: 470px; - height: 66vh; - background-color: var(--mainBackgroundColor); - overflow-y: auto; - border-bottom: 1px solid $separator-border-color; - - .playlist-info { - padding: 5px 30px; - background-color: #e4e4e4; - - .playlist-display-name { - font-size: 18px; - font-weight: $font-semibold; - margin-bottom: 5px; - } - - .playlist-by-index { - color: $grey-foreground-color; - display: flex; - - .playlist-by { - margin-right: 5px; - } - - .playlist-index span:first-child::after { - content: '/'; - margin: 0 3px; - } - } - } - - my-video-playlist-element-miniature { - /deep/ { - .video { - .position { - margin-right: 0; - } - - .video-info { - .video-info-name { - font-size: 15px; - } - } - } - - my-video-thumbnail { - @include thumbnail-size-component(90px, 50px); - } - } - } - } - /deep/ .video-js { width: getPlayerWidth(66vh); height: 66vh; @@ -508,7 +454,7 @@ my-video-comments { flex-direction: column; justify-content: center; - .playlist { + my-video-watch-playlist /deep/ .playlist { @include playlist-below-player; } } -- cgit v1.2.3