X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=e8ad10a11926f3e4a7b2cb1e3fbf07e8b0252215;hb=746018f6b81b40e8858303662ac9ec5ce59ac6eb;hp=b2bd04cf30fc64fe7556b8e256e4eb8de820bb3d;hpb=214ff6fa0099edeca18f42014cb731a96fba85fb;p=github%2FChocobozzz%2FPeerTube.git 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 b2bd04cf3..e8ad10a11 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.scss +++ b/client/src/app/+videos/+video-watch/video-watch.component.scss @@ -3,7 +3,7 @@ @import '_bootstrap-variables'; @import '_miniature'; -$player-factor: 1.7; // 16/9 +$player-factor: 16/9; $video-info-margin-left: 44px; @function getPlayerHeight($width){ @@ -27,13 +27,14 @@ $video-info-margin-left: 44px; flex-direction: column; justify-content: center; + $height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); + #videojs-wrapper { width: 100%; + height: $height; } ::ng-deep .video-js { - $height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); - height: $height; width: 100%; max-width: initial; @@ -50,6 +51,8 @@ $video-info-margin-left: 44px; } #video-wrapper { + $video-height: 66vh; + background-color: #000; display: flex; justify-content: center; @@ -58,6 +61,7 @@ $video-info-margin-left: 44px; display: flex; justify-content: center; flex-grow: 1; + height: $video-height; } .remote-server-down { @@ -84,7 +88,7 @@ $video-info-margin-left: 44px; ::ng-deep .video-js { width: 100%; max-width: getPlayerWidth(66vh); - height: 66vh; + height: $video-height; // VideoJS create an inner video player video { @@ -94,10 +98,14 @@ $video-info-margin-left: 44px; } @media screen and (max-width: 600px) { + #videojs-wrapper { + height: getPlayerHeight(100vw) !important; + } + .remote-server-down, ::ng-deep .video-js { width: 100vw; - height: getPlayerHeight(100vw) + height: getPlayerHeight(100vw) !important; } } } @@ -171,12 +179,6 @@ $video-info-margin-left: 44px; &:hover { opacity: 0.8; } - - img { - @include avatar(18px); - - margin: -2px 5px 0 0; - } } .video-info-channel-left { @@ -189,7 +191,7 @@ $video-info-margin-left: 44px; line-height: 1.37; a:nth-of-type(2) { - font-weight: 500; + font-weight: $font-regular; font-size: 90%; } @@ -204,11 +206,6 @@ $video-info-margin-left: 44px; } } - my-feed { - margin-left: 5px; - margin-top: 1px; - } - .video-actions-rates { margin: 0 0 10px 0; align-items: start; @@ -344,7 +341,7 @@ $video-info-margin-left: 44px; .video-info-description-html { @include peertube-word-wrap; - /deep/ a { + ::ng-deep a { text-decoration: none; } } @@ -405,37 +402,12 @@ $video-info-margin-left: 44px; } } } +} - ::ng-deep .other-videos { - padding-left: 15px; - min-width: $video-miniature-width; - - @media screen and (min-width: 1800px - (3* $video-miniature-width)) { - width: min-content; - } - - .title-page { - margin: 0 !important; - } - - .video-miniature { - display: flex; - width: max-content; - height: 100%; - padding-bottom: 20px; - flex-wrap: wrap; - } - - .video-bottom { - @media screen and (max-width: 1800px - (3* $video-miniature-width)) { - margin-left: 1rem; - } - @media screen and (max-width: 500px) { - margin-left: 0; - margin-top: .5rem; - } - } - } +my-recommended-videos { + display: block; + padding-left: 15px; + min-width: 250px; } my-video-comments { @@ -529,6 +501,7 @@ my-video-comments { } } +// Use the same breakpoint than in the typescript component to display the other video miniatures as row @media screen and (max-width: 1100px) { #video-wrapper { flex-direction: column; @@ -541,15 +514,10 @@ my-video-comments { .video-bottom { flex-direction: column; + } - ::ng-deep .other-videos { - padding-left: 0 !important; - - ::ng-deep .video-miniature { - flex-direction: row; - width: auto; - } - } + my-recommended-videos { + padding-left: 0; } } @@ -571,10 +539,6 @@ my-video-comments { } } - ::ng-deep .other-videos .video-miniature { - flex-direction: column; - } - .privacy-concerns { width: 100%; }