chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2135 from pixelfed/staging 

Update RemotePost, fix UI
This commit is contained in:
daniel 2020-04-20 23:16:43 -06:00 committed by GitHub
parent b41414f113 9dfb369d17
commit e8c0b815d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/rempos.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -21,7 +21,7 @@
"/js/profile.js": "/js/profile.js?id=21d25df460d1fa9bab60",
"/js/profile-directory.js": "/js/profile-directory.js?id=7160b00d9beda164f1bc",
"/js/quill.js": "/js/quill.js?id=9b15ab0ae830e7293390",
"/js/rempos.js": "/js/rempos.js?id=6695b8d4868883a34fcd",
"/js/rempos.js": "/js/rempos.js?id=05c5bbe056fec540d28a",
"/js/rempro.js": "/js/rempro.js?id=1cef29f9c7b39704a86a",
"/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
"/js/status.js": "/js/status.js?id=05b227c197bc00d64851",

7
resources/assets/js/components/RemotePost.vue
View File

@ -127,14 +127,13 @@
</span>
</div>
<div v-else>
<p :class="[status.content.length > 620 ? 'mb-1 read-more' : 'mb-1']" style="overflow: hidden;">
<a class="font-weight-bold pr-1 text-dark text-decoration-none" :href="profileUrl">{{statusUsername}}</a>
<p :class="[status.content.length > 620 ? 'mb-0 read-more' : 'mb-0']" style="overflow: hidden;">
<!-- <a class="font-weight-bold pr-1 text-dark text-decoration-none" :href="profileUrl">{{statusUsername}}</a> -->
<span class="comment-text" :id="status.id + '-status-readmore'" v-html="status.content"></span>
</p>
</div>
<div v-if="showComments">
<hr>
<div class="postCommentsLoader text-center py-2">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
@ -165,7 +164,7 @@
<a class="text-dark font-weight-bold mr-1" :href="reply.account.url" v-bind:title="reply.account.username">{{truncate(reply.account.username,15)}}</a>
<span class="text-break " v-html="reply.content"></span>
</span>
<span class="pl-2">
<span style="min-width:38px;">
<span v-on:click="likeReply(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
<post-menu :status="reply" :profile="user" :size="'sm'" :modal="'true'" class="d-inline-block px-2" v-on:deletePost="deleteComment(reply.id, index)"></post-menu>
</span>