X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=84b9aed397a363cbaf0e3e191b7ec9bcd46f1619;hb=31b6ddf86652502e0c96d77fa10861ce4af11aa4;hp=11406e88702c61ee765ce139d451442677dacccd;hpb=9a18a6252071cf21b18f82a24bb63078abb75bc1;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 11406e887..84b9aed39 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -16,12 +16,12 @@ $player-factor: 1.7; // 16/9 @mixin playlist-below-player { width: 100%; + height: auto; + max-height: 300px; border-bottom: 1px solid $separator-border-color; } .root { - margin: 0 -15px; - &.theater-enabled #video-wrapper { flex-direction: column; justify-content: center; @@ -51,6 +51,13 @@ $player-factor: 1.7; // 16/9 background-color: #000; display: flex; justify-content: center; + margin: 0 -15px; + + #videojs-wrapper { + display: flex; + justify-content: center; + flex-grow: 1; + } .remote-server-down { color: #fff; @@ -74,10 +81,12 @@ $player-factor: 1.7; // 16/9 } .playlist { - width: 400px; + 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; @@ -258,7 +267,9 @@ $player-factor: 1.7; // 16/9 display: flex; align-items: center; - .action-button:not(:first-child), .action-dropdown { + .action-button:not(:first-child), + .action-dropdown, + my-video-actions-dropdown { margin-left: 10px; } @@ -305,14 +316,6 @@ $player-factor: 1.7; // 16/9 margin-left: 3px; } } - - .action-dropdown { - display: inline-block; - - .dropdown-menu .dropdown-item { - @include dropdown-with-icon-item; - } - } } .video-info-likes-dislikes-bar { @@ -424,6 +427,7 @@ my-video-comments { // If the view is not expanded, take into account the menu .privacy-concerns { width: calc(100% - #{$menu-width}); + margin-left: -15px; } @media screen and (max-width: $small-view) { @@ -499,6 +503,15 @@ my-video-comments { } @media screen and (max-width: 1100px) { + #video-wrapper { + flex-direction: column; + justify-content: center; + + .playlist { + @include playlist-below-player; + } + } + .video-bottom { flex-direction: column; @@ -513,25 +526,9 @@ my-video-comments { } } -@media screen and (max-width: 900px) { - #video-wrapper { - flex-direction: column; - justify-content: center; - - #videojs-wrapper { - display: flex; - justify-content: center; - } - - .playlist { - @include playlist-below-player; - } - } -} - @media screen and (max-width: 600px) { .video-bottom { - margin: 20px 0 0 0; + margin: 20px 0 0 0 !important; .video-info { padding: 0;