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

Merge pull request #605 from pixelfed/frontend-ui-refactor

Browse source 
Update compiled assets, fixes #595
This commit is contained in:
daniel 2018-11-28 19:28:22 -07:00 committed by GitHub
parent 3d66a8c610 a0b00ce434
commit 07e5ff1525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/components.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{
"/js/components.js": "/js/components.js?id=1830e28a5b89d62c516d",
"/js/components.js": "/js/components.js?id=9b43be8feb8e7d974d25",
"/js/app.js": "/js/app.js?id=763d01bb175be69c8ad3",
"/css/app.css": "/css/app.css?id=0f11643b1635ebda5e1b",
"/js/timeline.js": "/js/timeline.js?id=415bfde862ab8c5b4548",

2
resources/assets/js/components.js vendored
View file

@ -3,7 +3,7 @@ import BootstrapVue from 'bootstrap-vue'
Vue.use(BootstrapVue);
pixelfed.readmore = () => {
$(document).find('.read-more').each(function(k,v) {
$('.read-more').each(function(k,v) {
let el = $(this);
let attr = el.attr('data-readmore');
if(typeof attr !== typeof undefined && attr !== false) {

4
resources/assets/js/components/PostComments.vue
View file

@ -23,7 +23,7 @@
<span class="pr-3" style="overflow: hidden;">
<div class="font-weight-bold pr-1"><bdi><a class="text-dark" :href="comment.account.url" :title="comment.account.username">{{l(comment.account.username)}}</a></bdi>
</div>
<div class="read-more" style="overflow: hidden;">
<div class="read-more" style="overflow: hidden;" :id="comment.id + '-reply-readmore'">
<span class="comment-text" v-html="comment.content" style="overflow: hidden;"></span>
</div>
</span>
@ -51,7 +51,7 @@ export default {
props: ['post-id', 'post-username', 'user'],
data() {
return {
results: {},
results: null,
pagination: {},
min_id: 0,
max_id: 0,

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

@ -91,7 +91,7 @@
<div class="status-comment">
<p class="mb-1 read-more" style="overflow: hidden;">
<span class="font-weight-bold pr-1">{{statusUsername}}</span>
<span class="comment-text"></span>
<span class="comment-text" :id="status.id + '-status-readmore'"></span>
</p>
<post-comments :user="this.user" :post-id="statusId" :post-username="statusUsername"></post-comments>
</div>