borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relax watch CSS

Browse Source
This commit is contained in:
Chocobozzz 2021-06-30 08:50:20 +02:00
parent 8d64a72b4c
commit d4f0b2ecec
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 161 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
client/src/app/+videos/+video-watch/video-watch.component.scss
View File

@ -4,6 +4,8 @@
@use '_bootstrap-variables'; @use '_bootstrap-variables';
@use '_miniature' as *; @use '_miniature' as *;
$video-height: 66vh;
@function getPlayerHeight ($width) { @function getPlayerHeight ($width) {
@return calc(#{$width} / #{$video-watch-player-factor}); @return calc(#{$width} / #{$video-watch-player-factor});
} }
@ -20,6 +22,23 @@
border-bottom: 1px solid $separator-border-color !important; border-bottom: 1px solid $separator-border-color !important;
} }
.blocked-label {
font-weight: $font-semibold;
}
.placeholder-image {
height: 100%;
}
.alert {
text-align: center;
border-radius: 0;
}
.flex-direction-column {
flex-direction: column;
}
.root { .root {
&.theater-enabled #video-wrapper { &.theater-enabled #video-wrapper {
$height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); $height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
@ -44,52 +63,14 @@
} }
} }
.blocked-label {
font-weight: $font-semibold;
}
.placeholder-image {
height: 100%;
}
#video-wrapper { #video-wrapper {
$video-height: 66vh;
background-color: #000; background-color: #000;
display: flex; display: flex;
justify-content: center; justify-content: center;
#videojs-wrapper {
display: flex;
justify-content: center;
flex-grow: 1;
height: $video-height;
}
.remote-server-down {
color: #fff;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
justify-content: center;
background-color: #141313;
width: 100%;
font-size: 24px;
height: 500px;
@media screen and (max-width: 1000px) {
font-size: 20px;
}
@media screen and (max-width: 600px) {
font-size: 16px;
}
}
::ng-deep .video-js { ::ng-deep .video-js {
width: 100%; width: 100%;
max-width: getPlayerWidth(66vh); max-width: getPlayerWidth($video-height);
height: $video-height; height: $video-height;
// VideoJS create an inner video player // VideoJS create an inner video player
@ -98,29 +79,36 @@
position: relative !important; position: relative !important;
} }
} }
}
#videojs-wrapper {
display: flex;
justify-content: center;
flex-grow: 1;
height: $video-height;
}
.remote-server-down {
color: #fff;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
justify-content: center;
background-color: #141313;
width: 100%;
font-size: 24px;
height: 500px;
@media screen and (max-width: 1000px) {
font-size: 20px;
}
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
#videojs-wrapper { font-size: 16px;
height: getPlayerHeight(100vw) !important;
}
.remote-server-down,
::ng-deep .video-js {
width: 100vw;
height: getPlayerHeight(100vw) !important;
}
} }
} }
.alert {
text-align: center;
border-radius: 0;
}
.flex-direction-column {
flex-direction: column;
}
#video-not-found { #video-not-found {
height: 300px; height: 300px;
line-height: 300px; line-height: 300px;
@ -133,121 +121,121 @@
.video-bottom { .video-bottom {
display: flex; display: flex;
margin-top: 1.5rem; margin-top: 1.5rem;
}
.video-info { .video-info {
flex-grow: 1;
// Set min width for flex item
min-width: 1px;
max-width: 100%;
}
.video-info-first-row {
display: flex;
> div:first-child {
flex-grow: 1; flex-grow: 1;
// Set min width for flex item }
min-width: 1px; }
max-width: 100%;
.video-info-first-row { .video-info-name {
display: flex; @include peertube-word-wrap;
> div:first-child { @include margin-right(30px);
flex-grow: 1;
}
.video-info-name { min-height: 40px; // Align with the action buttons
@include peertube-word-wrap; font-size: 27px;
font-weight: $font-semibold;
flex-grow: 1;
}
@include margin-right(30px); .video-info-first-row-bottom {
display: flex;
flex-wrap: wrap;
align-items: center;
width: 100%;
}
min-height: 40px; // Align with the action buttons .video-info-date-views {
font-size: 27px; @include margin-right(10px);
font-weight: $font-semibold;
flex-grow: 1;
}
.video-info-first-row-bottom { margin-bottom: 10px;
display: flex; align-self: start;
flex-wrap: wrap; font-size: 1em;
align-items: center; }
width: 100%;
}
.video-info-date-views { .video-info-channel {
@include margin-right(10px); font-weight: $font-semibold;
font-size: 15px;
margin-bottom: 10px; a {
align-self: start; @include disable-default-a-behaviour;
font-size: 1em; @include peertube-word-wrap;
}
.video-info-channel { color: pvar(--mainForegroundColor);
font-weight: $font-semibold;
font-size: 15px;
a { &:hover {
@include disable-default-a-behaviour; opacity: 0.8;
@include peertube-word-wrap; }
}
}
color: pvar(--mainForegroundColor); .video-info-channel-left {
flex-grow: 1;
&:hover { .video-info-channel-left-links {
opacity: 0.8; display: flex;
} flex-direction: column;
} position: relative;
line-height: 1.37;
.video-info-channel-left { a:nth-of-type(2) {
flex-grow: 1; font-weight: $font-regular;
font-size: 90%;
.video-info-channel-left-links {
display: flex;
flex-direction: column;
position: relative;
line-height: 1.37;
a:nth-of-type(2) {
font-weight: $font-regular;
font-size: 90%;
}
a.single-link {
margin-top: 7px;
}
}
}
my-subscribe-button {
@include margin-left(5px);
}
}
} }
.video-attributes { a.single-link {
@include margin-left($video-watch-info-margin-left); margin-top: 7px;
} }
}
}
.video-attributes .video-attribute { my-subscribe-button {
font-size: 13px; @include margin-left(5px);
display: block; }
margin-bottom: 12px;
.video-attribute-label { .video-attributes {
@include padding-right(5px); @include margin-left($video-watch-info-margin-left);
min-width: 142px; .video-attribute {
display: inline-block; font-size: 13px;
color: pvar(--greyForegroundColor); display: block;
font-weight: $font-bold; margin-bottom: 12px;
} }
}
a.video-attribute-value { .video-attribute-label {
@include disable-default-a-behaviour; @include padding-right(5px);
color: pvar(--mainForegroundColor);
&:hover { min-width: 142px;
opacity: 0.9; display: inline-block;
} color: pvar(--greyForegroundColor);
} font-weight: $font-bold;
}
&.video-attribute-tags { a.video-attribute-value {
.video-attribute-value:not(:nth-child(2)) { @include disable-default-a-behaviour;
&::before { color: pvar(--mainForegroundColor);
content: ', ';
} &:hover {
} opacity: 0.9;
} }
}
.video-attribute-tags {
.video-attribute-value:not(:nth-child(2)) {
&::before {
content: ', ';
} }
} }
} }
@ -278,7 +266,7 @@ my-video-comments {
} }
@media screen and (max-width: 1600px) { @media screen and (max-width: 1600px) {
.video-bottom .video-info .video-attributes .video-attribute { .video-attributes .video-attribute {
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
@ -304,35 +292,38 @@ my-video-comments {
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
#videojs-wrapper {
height: getPlayerHeight(100vw) !important;
.remote-server-down,
::ng-deep .video-js {
width: 100vw;
height: getPlayerHeight(100vw) !important;
}
}
.video-bottom { .video-bottom {
margin-top: 20px !important; margin-top: 20px !important;
padding-bottom: 20px !important; padding-bottom: 20px !important;
}
.video-info { .video-info {
padding: 0; padding: 0;
}
.video-info-first-row { .video-info-name {
font-size: 20px;
.video-info-name { height: auto;
font-size: 20px;
height: auto;
}
}
}
} }
} }
@media screen and (max-width: 450px) { @media screen and (max-width: 450px) {
.video-bottom { .video-info-name {
.video-info .video-info-first-row { font-size: 18px;
.video-info-name { }
font-size: 18px;
}
.video-info-date-views { .video-info-date-views {
font-size: 14px; font-size: 14px;
}
}
} }
my-action-buttons { my-action-buttons {
@ -340,7 +331,6 @@ my-video-comments {
} }
} }
// Special case for iOS, that takes into account the width for fullscreens // Special case for iOS, that takes into account the width for fullscreens
#video-wrapper ::ng-deep .video-js.vjs-fullscreen { #video-wrapper ::ng-deep .video-js.vjs-fullscreen {
max-width: unset; max-width: unset;

4
client/src/app/shared/shared-video-miniature/video-miniature.component.html
View File

@ -11,12 +11,12 @@
<div class="video-miniature-information"> <div class="video-miniature-information">
<div class="d-flex video-miniature-meta"> <div class="d-flex video-miniature-meta">
<my-actor-avatar <my-actor-avatar
*ngIf="displayOptions.avatar && displayOwnerVideoChannel()" [title]="channelLinkTitle" *ngIf="displayOptions.avatar && displayOwnerVideoChannel() && !displayAsRow" [title]="channelLinkTitle"
[channel]="video.channel" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]" [channel]="video.channel" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
></my-actor-avatar> ></my-actor-avatar>
<my-actor-avatar <my-actor-avatar
*ngIf="displayOptions.avatar && displayOwnerAccount()" [title]="channelLinkTitle" *ngIf="displayOptions.avatar && displayOwnerAccount() && !displayAsRow" [title]="channelLinkTitle"
[account]="video.account" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]" [account]="video.account" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
></my-actor-avatar> ></my-actor-avatar>