ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1719 from Human-Connection/1718-fix-comment-editor-styling-update-bug

Browse Source 
Fix bug UpdateComment, Fix styling on Comment
This commit is contained in:
Robert Schäfer 2019-09-26 23:14:33 +02:00 committed by GitHub
commit 0869aeb58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/Comment/Comment.vue
View File

@ -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"

4
webapp/pages/post/_id/_slug/index.vue
View File

@ -189,6 +189,10 @@ export default {
margin-top: $space-small;
position: relative;
}
.ProseMirror {
min-height: 0px;
}
}
.ds-card-image {