From 4345f0b41e5383c6883a1195e180c9ed5ce8f08c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 13 Jul 2023 10:11:51 -0600
Subject: [PATCH] Update file comment UI and comment in parallel diff

Changelog: changed
---
 app/assets/javascripts/diffs/components/diff_file.vue  |  2 +-
 .../javascripts/notes/components/noteable_note.vue     |  3 ++-
 app/assets/stylesheets/framework/diffs.scss            |  7 -------
 .../stylesheets/page_bundles/merge_requests.scss       | 10 +---------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index f8643dfea5a59f..95a8c30ce7fe3b 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -473,7 +473,7 @@ export default {
             </template>
           </gl-sprintf>
         </gl-alert>
-        <div v-if="showFileDiscussions" class="gl-border-b" data-testid="file-discussions">
+        <div v-if="showFileDiscussions" data-testid="file-discussions">
           <div class="diff-file-discussions-wrapper">
             <diff-discussions
               v-if="fileDiscussions.length"
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index 2a921b8c5adf5d..69c41af97ab2da 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -210,7 +210,8 @@ export default {
       return fileResolvedFromAvailableSource || null;
     },
     isMRDiffView() {
-      return this.line && !this.isOverviewTab;
+      const isFileComment = this.note.position?.position_type === 'file';
+      return !this.isOverviewTab && (this.line || isFileComment);
     },
   },
   created() {
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index d91b90f9083f6b..7b35659e90a345 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -876,13 +876,6 @@ table.code {
   }
 }
 
-.parallel {
-  .discussion-collapsible {
-    margin: $gl-padding;
-    margin-top: 0;
-  }
-}
-
 .image-diff-overlay,
 .image-diff-overlay-add-comment {
   top: 0;
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index f722b71772d0c9..5e20588dd7083a 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -1276,20 +1276,12 @@ $tabs-holder-z-index: 250;
 .diff-file-discussions-wrapper {
   @include gl-w-full;
 
-  max-width: 800px;
-
-  .diff-discussions > .notes {
-    @include gl-p-5;
-  }
-
   .diff-discussions:not(:first-child) >.notes {
     @include gl-pt-0;
   }
 
   .note-discussion {
-    @include gl-rounded-base;
-
-    border: 1px solid var(--gray-100, $gray-100) !important;
+    border-bottom: 1px solid var(--gray-100, $gray-100) !important;
   }
 
   .discussion-collapsible {
-- 
GitLab