From 0f40df7cb4fb1f77cf5b9f287e47036660fa805e Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 25 Sep 2019 13:39:18 +0200
Subject: [PATCH] Fix bug UpdateComment, Fix styling on Comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
---
 webapp/components/Comment/Comment.vue | 4 ++--
 webapp/pages/post/_id/_slug/index.vue | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index a1bd7dd34..49f29bfe9 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -11,7 +11,7 @@
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card :id="`commentId-${comment.id}`">
-      <ds-space margin-bottom="small" margin-top="base">
+      <ds-space margin-bottom="small" margin-top="small">
         <hc-user :user="author" :date-time="comment.createdAt" />
         <!-- Content Menu (can open Modals) -->
         <client-only>
@@ -37,7 +37,7 @@
           @collapse="isCollapsed = true"
         />
       </div>
-      <div v-show="!openEditCommentMenu">
+      <div v-else>
         <content-viewer
           v-if="$filters.removeHtml(comment.content).length < 180"
           :content="comment.content"
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index dd84ee3d7..d03cd5c70 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -189,6 +189,10 @@ export default {
         margin-top: $space-small;
         position: relative;
       }
+
+      .ProseMirror {
+        min-height: 0px;
+      }
     }
 
     .ds-card-image {