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

Merge pull request #2119 from pixelfed/staging

Browse source 
oof
This commit is contained in:
daniel 2020-04-17 20:49:46 -06:00 committed by GitHub
parent 32ba933a41 2121f8183b
commit 6d8c7e253f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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=283e11d6405237c6b8c1",
"/js/status.js": "/js/status.js?id=05cf9e6d1050628bab3d",
"/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"

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

@ -173,7 +173,7 @@
</span>
</p>
<p class="">
<a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(reply.created_at)" :href="permalinkUrl(reply.url)"></a>
<a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(reply.created_at)" :href="permalinkUrl(reply)"></a>
<span v-if="reply.favourites_count" class="text-muted comment-reaction font-weight-bold mr-3">{{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}}</span>
<span class="text-muted comment-reaction font-weight-bold cursor-pointer" v-on:click="replyFocus(reply, index)">Reply</span>
</p>