summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 12:09:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 12:09:12 +0000
commit0e0df204c1a0d859ccbbe1be83a5e09a53381f17 (patch)
treee7bf6fed5fa2b74caf31957c468b0cbc303f4c45 /app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
parenta2344dbf1942dc3919c55b0684d2566368e03852 (diff)
downloadgitlab-ce-0e0df204c1a0d859ccbbe1be83a5e09a53381f17.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/work_items/components/notes/work_item_add_note.vue')
-rw-r--r--app/assets/javascripts/work_items/components/notes/work_item_add_note.vue11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
index f9f4bf260a1..e10a82b5197 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
@@ -142,10 +142,13 @@ export default {
return this.isNewDiscussion ? __('Comment') : __('Reply');
},
timelineEntryClass() {
- return this.isNewDiscussion
- ? 'timeline-entry note-form'
- : // eslint-disable-next-line @gitlab/require-i18n-strings
- 'note note-wrapper note-comment discussion-reply-holder gl-border-t-0! clearfix gl-bg-white! gl-pt-0!';
+ return {
+ 'timeline-entry note-form': this.isNewDiscussion,
+ // eslint-disable-next-line @gitlab/require-i18n-strings
+ 'note note-wrapper note-comment discussion-reply-holder gl-border-t-0! clearfix': !this
+ .isNewDiscussion,
+ 'gl-bg-white! gl-pt-0!': this.isEditing,
+ };
},
},
watch: {