4 files changed, 24 insertions, 20 deletions

diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/videos/+video-watch/comment/video-comment.component.html
index d5aacf107..4753641bd 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.html
@@ -11,7 +11,7 @@
     <div class="vertical-border"></div>
   </div>
 
-  <div class="right">
+  <div class="right" [ngClass]="{ 'mb-3': firstInThread }">
     <span *ngIf="comment.isDeleted" class="comment-avatar"></span>
 
     <div class="comment">
@@ -81,5 +81,7 @@
         </div>
       </div>
     </div>
+
+    <ng-content></ng-content>
   </div>
 </div>
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
index 0d48f0a82..8c376d654 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
@@ -22,6 +22,7 @@ export class VideoCommentComponent implements OnInit, OnChanges {
   @Input() commentTree: VideoCommentThreadTree
   @Input() inReplyToCommentId: number
   @Input() highlightedComment = false
+  @Input() firstInThread = false
 
   @Output() wantedToDelete = new EventEmitter<VideoComment>()
   @Output() wantedToReply = new EventEmitter<VideoComment>()
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 8f5c583d3..e25efc3ee 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -46,6 +46,7 @@
           [inReplyToCommentId]="inReplyToCommentId"
           [commentTree]="threadComments[highlightedThread.id]"
           [highlightedComment]="true"
+          [firstInThread]="true"
           (wantedToReply)="onWantedToReply($event)"
           (wantedToDelete)="onWantedToDelete($event)"
           (threadCreated)="onThreadCreated($event)"
@@ -54,36 +55,38 @@
         ></my-video-comment>
       </div>
 
-      <div *ngFor="let comment of comments">
+      <div *ngFor="let comment of comments; index as i">
         <my-video-comment
           *ngIf="!highlightedThread || comment.id !== highlightedThread.id"
           [comment]="comment"
           [video]="video"
           [inReplyToCommentId]="inReplyToCommentId"
           [commentTree]="threadComments[comment.id]"
+          [firstInThread]="i + 1 !== comments.length"
           (wantedToReply)="onWantedToReply($event)"
           (wantedToDelete)="onWantedToDelete($event)"
           (threadCreated)="onThreadCreated($event)"
           (resetReply)="onResetReply()"
           (timestampClicked)="handleTimestampClicked($event)"
-        ></my-video-comment>
-
-        <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies">
-          <span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
-
-          <ng-container *ngIf="comment.totalRepliesFromVideoAuthor > 0; then hasAuthorComments; else noAuthorComments"></ng-container>
-          <ng-template #hasAuthorComments>
-            <ng-container *ngIf="comment.totalReplies !== comment.totalRepliesFromVideoAuthor; else onlyAuthorComments" i18n>
-              View {{ comment.totalReplies }} replies from {{ video?.account?.displayName || 'the author' }} and others
-            </ng-container>
-            <ng-template i18n #onlyAuthorComments>
-              View {{ comment.totalReplies }} replies from {{ video?.account?.displayName || 'the author' }}
+        >
+          <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies mb-2">
+            <span class="glyphicon glyphicon-menu-down"></span>
+  
+            <ng-container *ngIf="comment.totalRepliesFromVideoAuthor > 0; then hasAuthorComments; else noAuthorComments"></ng-container>
+            <ng-template #hasAuthorComments>
+              <ng-container *ngIf="comment.totalReplies !== comment.totalRepliesFromVideoAuthor; else onlyAuthorComments" i18n>
+                View {{ comment.totalReplies }} replies from {{ video?.account?.displayName || 'the author' }} and others
+              </ng-container>
+              <ng-template i18n #onlyAuthorComments>
+                View {{ comment.totalReplies }} replies from {{ video?.account?.displayName || 'the author' }}
+              </ng-template>
             </ng-template>
-          </ng-template>
-          <ng-template i18n #noAuthorComments>View {{ comment.totalReplies }} replies</ng-template>
+            <ng-template i18n #noAuthorComments>View {{ comment.totalReplies }} replies</ng-template>
+  
+            <my-small-loader class="comment-thread-loading ml-1" [loading]="threadLoading[comment.id]"></my-small-loader>
+          </div>
+        </my-video-comment>
 
-          <my-small-loader class="comment-thread-loading" [loading]="threadLoading[comment.id]"></my-small-loader>
-        </div>
       </div>
     </div>
   </ng-template>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
index 600bc1cee..f95ff5aba 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
@@ -9,8 +9,6 @@
   font-weight: $font-semibold;
   font-size: 15px;
   cursor: pointer;
-  margin-left: 46px;
-  margin-bottom: 10px;
 }
 
 .glyphicon, .comment-thread-loading {