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

Merge pull request #2129 from pixelfed/staging 

RemotePost.vue component fixes
This commit is contained in:
daniel 2020-04-19 20:32:21 -06:00 committed by GitHub
parent aad10299f8 319488481d
commit 753ec907f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 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=72115a0793a2792beb39",
"/js/rempos.js": "/js/rempos.js?id=8dafb37fda5c7977b9af",
"/js/rempro.js": "/js/rempro.js?id=e71bc833e4381e9a7655",
"/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
"/js/status.js": "/js/status.js?id=05b227c197bc00d64851",

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

@ -141,7 +141,7 @@
</div>
</div>
<div class="postCommentsContainer d-none">
<p v-if="status.reply_count > 10" class="mb-1 text-center load-more-link d-none my-3">
<p class="mb-1 text-center load-more-link d-none my-3">
<a href="#" class="text-dark" v-on:click="loadMore" title="Load more comments" data-toggle="tooltip" data-placement="bottom">
<svg class="bi bi-plus-circle" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="font-size:2em;"> <path fill-rule="evenodd" d="M8 3.5a.5.5 0 01.5.5v4a.5.5 0 01-.5.5H4a.5.5 0 010-1h3.5V4a.5.5 0 01.5-.5z" clip-rule="evenodd"/> <path fill-rule="evenodd" d="M7.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0V8z" clip-rule="evenodd"/> <path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z" clip-rule="evenodd"/></svg>
</a>
@ -1015,7 +1015,7 @@ export default {
permalinkUrl(reply, showOrigin = false) {
let profile = reply.account;
if(profile.local == true) {
return profile.url;
return reply.url;
} else {
return showOrigin ?
reply.url :