diff options
| author | David Palubin <dpalubin@gmail.com> | 2019-07-05 16:42:51 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-05 16:42:51 +0000 |
| commit | 1897ec48d3ea4bea0a501e88944eeffc7e16ca70 (patch) | |
| tree | c782077f31653916e790733c3a6636a7571ff0d4 /app/assets/javascripts/notes/components/noteable_discussion.vue | |
| parent | 1e9dd1761846135640d5c00e4a801e645bc743e3 (diff) | |
| download | gitlab-ce-1897ec48d3ea4bea0a501e88944eeffc7e16ca70.tar.gz | |
Remove unresolved class and fixed height in discussion header
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_discussion.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 3fbd0a9f715..ac743d9f4b8 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -144,15 +144,6 @@ export default { return {}; }, - componentClassName() { - if (this.shouldRenderDiffs) { - if (!this.lastUpdatedAt && !this.discussion.resolved) { - return 'unresolved'; - } - } - - return ''; - }, isExpanded() { return this.discussion.expanded || this.alwaysExpanded; }, @@ -313,11 +304,11 @@ export default { </script> <template> - <timeline-entry-item class="note note-discussion" :class="componentClassName"> + <timeline-entry-item class="note note-discussion"> <div class="timeline-content"> <div :data-discussion-id="discussion.id" class="discussion js-discussion-container"> <div v-if="shouldRenderDiffs" class="discussion-header note-wrapper"> - <div v-once class="timeline-icon"> + <div v-once class="timeline-icon align-self-start flex-shrink-0"> <user-avatar-link v-if="author" :link-href="author.path" @@ -326,7 +317,7 @@ export default { :img-size="40" /> </div> - <div class="timeline-content"> + <div class="timeline-content w-100"> <note-header :author="author" :created-at="firstNote.created_at" |