fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2126 from pixelfed/staging

Browse source 
Update PostComponent, fix missing like button on comments
This commit is contained in:
daniel 2020-04-19 13:58:33 -06:00 committed by GitHub
parent 7f70eecf28 f3afeda774
commit 57d80ebe72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@
### Updated
- Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))
- Updated PostComponent, fix missing like button on comments ([132c1dce](https://github.com/pixelfed/pixelfed/commit/132c1dce))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

2
public/js/status.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=72115a0793a2792beb39",
"/js/rempro.js": "/js/rempro.js?id=e71bc833e4381e9a7655",
"/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
"/js/status.js": "/js/status.js?id=05cf9e6d1050628bab3d",
"/js/status.js": "/js/status.js?id=d1a6fed4bcec52699d52",
"/js/story-compose.js": "/js/story-compose.js?id=86751d072969424c6e30",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",
"/js/timeline.js": "/js/timeline.js?id=950c4a752e7b2824cb6d"

6
resources/assets/js/components/PostComponent.vue
View file

@ -164,11 +164,11 @@
<div v-else>
<p class="d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;">
<span>
<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>
<a class="text-dark font-weight-bold mr-1 text-break" :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 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> -->
<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>
</p>