From 7b3370d122b2c293d2853133189267ab9828ca57 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 9 Apr 2024 12:16:44 -0600 Subject: [PATCH] Adjust border radius of collapsed conflicted file Changelog: changed --- app/assets/javascripts/diffs/components/diff_file.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 849b590a3c4278..c8a6f4d457df10 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -420,7 +420,14 @@ export default { :show-local-file-reviews="showLocalFileReviews" :pinned="isPinnedFile" class="js-file-title file-title gl-border-1 gl-border-solid gl-border-gray-100" - :class="[hasBodyClasses.header, { 'gl-border-red-500! gl-bg-red-200!': file.conflict_type }]" + :class="[ + hasBodyClasses.header, + { + 'gl-border-red-500! gl-bg-red-200!': file.conflict_type, + 'gl-rounded-bottom-left-none! gl-rounded-bottom-right-none!': + file.conflict_type && isCollapsed, + }, + ]" @toggleFile="handleToggle({ viaUserInteraction: true })" @showForkMessage="showForkMessage" /> -- GitLab