OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Add commentor name alongside fid for video comments

pull/2356/head
Rigel Kent 2019-12-18 13:27:51 +01:00
parent 9f0327aeb3
commit 5dfb7c1dec
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/app.component.scss
View File

@ -25,7 +25,6 @@
height: $header-height; height: $header-height;
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1;
min-width: 0; min-width: 0;
.icon { .icon {
@ -81,6 +80,7 @@
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
white-space: nowrap; white-space: nowrap;
flex: 1;
} }
} }

2
client/src/app/shared/video/video-miniature.component.scss
View File

@ -3,7 +3,7 @@
@import '_miniature'; @import '_miniature';
$more-button-width: 41px; $more-button-width: 41px;
$more-margin-right: 10px; $more-margin-right: 15px;
.video-miniature { .video-miniature {
width: $video-miniature-width; width: $video-miniature-width;

10
client/src/app/videos/+video-watch/comment/video-comment.component.html
View File

@ -19,12 +19,12 @@
<div *ngIf="highlightedComment === true" class="highlighted-comment" i18n>Highlighted comment</div> <div *ngIf="highlightedComment === true" class="highlighted-comment" i18n>Highlighted comment</div>
<div class="comment-account-date"> <div class="comment-account-date">
<a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" <a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" class="comment-account">
class="comment-account" <span class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }">{{ comment.account.displayName }}</span>
[ngClass]="{ 'video-author': video.account.id === comment.account.id }" <span class="comment-account-fid ml-1">{{ comment.by }}</span>
>{{ comment.by }}</a> </a>
<a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]"
class="comment-date">{{ comment.createdAt | myFromNow }}</a> class="comment-date" [title]="comment.createdAt">{{ comment.createdAt | myFromNow }}</a>
</div> </div>
<div <div
class="comment-html" class="comment-html"

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

@ -67,8 +67,12 @@
word-break: break-all; word-break: break-all;
color: var(--mainForegroundColor); color: var(--mainForegroundColor);
font-weight: $font-bold; font-weight: 600;
font-size: 90%; font-size: 90%;
.comment-account-fid {
opacity: .6;
}
} }
.comment-date { .comment-date {
@ -81,7 +85,6 @@
.comment-html { .comment-html {
@include peertube-word-wrap; @include peertube-word-wrap;
margin-bottom: 10px;
// Mentions // Mentions
::ng-deep a { ::ng-deep a {
@ -96,6 +99,11 @@
} }
// Paragraphs
::ng-deep p {
margin-bottom: .3rem;
}
&.comment-html-deleted { &.comment-html-deleted {
color: $grey-foreground-color; color: $grey-foreground-color;
} }

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

@ -412,6 +412,10 @@ $video-info-margin-left: 44px;
@media screen and (max-width: 1800px - (3* $video-miniature-width)) { @media screen and (max-width: 1800px - (3* $video-miniature-width)) {
margin-left: 1rem; margin-left: 1rem;
} }
@media screen and (max-width: 500px) {
margin-left: 0;
margin-top: .5rem;
}
} }
} }
} }