Improve playlist element style

pull/1765/head
Chocobozzz 2019-04-05 15:23:41 +02:00
parent 8dfceec44a
commit 3143ae17a0
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 49 additions and 43 deletions

View File

@ -7,7 +7,7 @@
></my-video-playlist-miniature>
</div>
<div class="col-xs-12 col-md-7 col-xl-9">
<div class="playlist-elements col-xs-12 col-md-7 col-xl-9">
<div i18n class="no-results" *ngIf="pagination.totalItems === 0">No videos in this playlist.</div>
<div

View File

@ -13,7 +13,7 @@
background-color: rgba(0, 0, 0, 0.05);
.more {
display: block;
opacity: 1;
}
}
@ -24,11 +24,10 @@
a {
@include disable-default-a-behaviour;
min-width: 0;
display: flex;
min-width: 0;
align-items: center;
cursor: pointer;
flex-grow: 1;
.position {
font-weight: $font-semibold;
@ -55,6 +54,7 @@
.video-info {
display: flex;
flex-direction: column;
align-self: flex-start;
min-width: 0;
a {
@ -69,6 +69,7 @@
.video-info-name {
font-size: 18px;
font-weight: $font-semibold;
display: inline-block;
@include ellipsis;
}
@ -83,10 +84,10 @@
justify-self: flex-end;
margin-left: auto;
cursor: pointer;
display: none;
opacity: 0;
&.show {
display: block;
opacity: 1;
}
.icon-more {

View File

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'
import { Video } from '@app/shared/video/video.model'
import { VideoPlaylistElementUpdate } from '@shared/models'
import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core'

View File

@ -19,14 +19,14 @@
{{ playlist.displayName }}
</a>
<div class="video-info-privacy" *ngIf="displayPrivacy">{{ playlist.privacy.label }}</div>
<a i18n [routerLink]="[ '/video-channels', playlist.videoChannelBy ]" class="by" *ngIf="displayChannel && playlist.videoChannelBy">
{{ playlist.videoChannelBy }}
</a>
<div class="video-info-by-date">
<a i18n [routerLink]="[ '/video-channels', playlist.videoChannelBy ]" class="by" *ngIf="displayChannel && playlist.videoChannelBy">
{{ playlist.videoChannelBy }}
</a>
<div class="privacy-date">
<span class="video-info-privacy" *ngIf="displayPrivacy">{{ playlist.privacy.label }}</span>
<div i18n class="updated-at">Updated {{ playlist.updatedAt | myFromNow }}</div>
<span i18n class="updated-at">Updated {{ playlist.updatedAt | myFromNow }}</span>
</div>
<div *ngIf="displayDescription" class="video-info-description">{{ playlist.description }}</div>

View File

@ -43,18 +43,25 @@
.miniature-name {
@include miniature-name;
@include ellipsis-multiline(1.3em, 2);
margin: 0;
}
.video-info-by-date {
display: flex;
font-size: 13px;
margin: 5px 0;
.by {
@include disable-default-a-behaviour;
.by {
@include disable-default-a-behaviour;
display: block;
color: $grey-foreground-color;
}
display: block;
color: var(--mainForegroundColor);
.privacy-date {
margin-top: 5px;
.video-info-privacy {
font-size: 14px;
font-weight: $font-semibold;
&::after {
content: '-';
@ -63,11 +70,6 @@
}
}
.video-info-privacy {
font-size: 13px;
font-weight: $font-semibold;
}
.video-info-description {
margin-top: 10px;
color: $grey-foreground-color;

View File

@ -16,6 +16,8 @@ $player-factor: 1.7; // 16/9
@mixin playlist-below-player {
width: 100%;
height: auto;
max-height: 300px;
border-bottom: 1px solid $separator-border-color;
}
@ -51,6 +53,12 @@ $player-factor: 1.7; // 16/9
justify-content: center;
margin: 0 -15px;
#videojs-wrapper {
display: flex;
justify-content: center;
flex-grow: 1;
}
.remote-server-down {
color: #fff;
display: flex;
@ -73,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;
@ -492,6 +502,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;
@ -506,22 +525,6 @@ 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 !important;