Improve comment tree UI

pull/2330/head
Chocobozzz 2019-12-10 10:40:25 +01:00
parent cd3d847d63
commit fc641dedd6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 113 additions and 76 deletions

View File

@ -10,10 +10,10 @@ form {
margin-bottom: 10px; margin-bottom: 10px;
img { img {
@include avatar(36px); @include avatar(25px);
vertical-align: top; vertical-align: top;
margin-right: 20px; margin-right: 10px;
} }
.form-group { .form-group {
@ -40,10 +40,14 @@ form {
} }
} }
@media screen and (max-width: 450px) { @media screen and (max-width: 600px) {
textarea, .submit-comment button { textarea, .submit-comment button {
font-size: 14px !important; font-size: 14px !important;
} }
textarea {
padding: 5px !important;
}
} }
.modal-body { .modal-body {

View File

@ -1,4 +1,5 @@
<div class="root-comment"> <div class="root-comment">
<div class="left">
<img <img
*ngIf="!comment.isDeleted" *ngIf="!comment.isDeleted"
class="comment-avatar" class="comment-avatar"
@ -6,10 +7,11 @@
alt="Avatar" alt="Avatar"
/> />
<span <div class="vertical-border"></div>
*ngIf="comment.isDeleted" </div>
class="comment-avatar"
></span> <div class="right">
<span *ngIf="comment.isDeleted" class="comment-avatar"></span>
<div class="comment"> <div class="comment">
<ng-container *ngIf="!comment.isDeleted"> <ng-container *ngIf="!comment.isDeleted">
@ -17,7 +19,8 @@
<div class="comment-account-date"> <div class="comment-account-date">
<a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" class="comment-account">{{ comment.by }}</a> <a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" class="comment-account">{{ comment.by }}</a>
<a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" class="comment-date">{{ comment.createdAt | myFromNow }}</a> <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]"
class="comment-date">{{ comment.createdAt | myFromNow }}</a>
</div> </div>
<div class="comment-html" [innerHTML]="sanitizedCommentHTML"></div> <div class="comment-html" [innerHTML]="sanitizedCommentHTML"></div>
@ -30,7 +33,8 @@
<ng-container *ngIf="comment.isDeleted"> <ng-container *ngIf="comment.isDeleted">
<div class="comment-account-date"> <div class="comment-account-date">
<span class="comment-account" i18n>Deleted</span> <span class="comment-account" i18n>Deleted</span>
<a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" class="comment-date">{{ comment.createdAt | myFromNow }}</a> <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]"
class="comment-date">{{ comment.createdAt | myFromNow }}</a>
</div> </div>
<div *ngIf="comment.isDeleted" class="comment-html comment-html-deleted"> <div *ngIf="comment.isDeleted" class="comment-html comment-html-deleted">
@ -63,4 +67,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>

View File

@ -5,11 +5,24 @@
font-size: 15px; font-size: 15px;
display: flex; display: flex;
.left {
display: flex;
flex-direction: column;
align-items: center;
margin-right: 10px;
.vertical-border {
width: 2px;
height: 100%;
background-color: rgba(0, 0, 0, 0.05);
margin: 10px 0;
}
}
.comment-avatar { .comment-avatar {
@include avatar(36px); @include avatar(36px);
margin-top: 5px; margin-top: 5px;
margin-right: 20px;
} }
.comment { .comment {
@ -84,33 +97,47 @@
} }
} }
} }
}
// Decrease the space of child comments on small screens
@media screen and (max-width: 1600px) {
.children { .children {
margin-left: -20px; // Reduce avatars size for replies
.comment-avatar {
@include avatar(25px);
}
.left {
margin-right: 6px;
}
} }
} }
@media screen and (max-width: 1200px) { @media screen and (max-width: 1200px) {
.children { .children {
margin-left: -30px; margin-left: -10px;
} }
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.root-comment {
.children { .children {
margin-left: -35px; margin-left: -20px;
.left {
align-items: flex-start;
.vertical-border {
margin-left: 2px;
}
}
} }
.root-comment { .comment {
.comment-avatar { margin-right: 10px; } .comment-account-date {
} flex-direction: column;
}
@media screen and (max-width: 450px) { .comment-date {
.root-comment { margin-left: 0;
font-size: 14px; }
}
}
} }
} }

View File

@ -9,7 +9,7 @@
font-weight: $font-semibold; font-weight: $font-semibold;
font-size: 15px; font-size: 15px;
cursor: pointer; cursor: pointer;
margin-left: 56px; margin-left: 46px;
margin-bottom: 10px; margin-bottom: 10px;
} }

View File

@ -44,7 +44,7 @@
} }
@mixin peertube-word-wrap { @mixin peertube-word-wrap {
word-break: normal; word-break: break-word;
word-wrap: break-word; word-wrap: break-word;
overflow-wrap: break-word; overflow-wrap: break-word;
-webkit-hyphens: auto; -webkit-hyphens: auto;
@ -397,6 +397,7 @@
width: $size; width: $size;
height: $size; height: $size;
min-width: $size; min-width: $size;
min-height: $size;
} }
@mixin chevron ($size, $border-width) { @mixin chevron ($size, $border-width) {