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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-04-29 22:06:12 -06:00 committed by GitHub
parent 1f0c5d0df5 aa09413fa4
commit e7613ddd6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 239 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/pixelfed.php
View File

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance. | This value is the version of your PixelFed instance.
| |
*/ */
'version' => '0.9.1', 'version' => '0.9.2',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -11,5 +11,5 @@
"/js/profile.js": "/js/profile.js?id=0bb23e4365ea2cd8516c", "/js/profile.js": "/js/profile.js?id=0bb23e4365ea2cd8516c",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204", "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf", "/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf",
"/js/timeline.js": "/js/timeline.js?id=dfbe3fad9f49a2d3b995" "/js/timeline.js": "/js/timeline.js?id=ddd67f04a35444e402f7"
} }

10
resources/assets/js/components/Timeline.vue
View File

@ -2,6 +2,7 @@
<div class="container" style=""> <div class="container" style="">
<div class="row"> <div class="row">
<div class="col-md-8 col-lg-8 pt-sm-2 px-0 my-sm-3 timeline order-2 order-md-1"> <div class="col-md-8 col-lg-8 pt-sm-2 px-0 my-sm-3 timeline order-2 order-md-1">
<div style="padding-top:10px;">
<div v-if="loading" class="text-center"> <div v-if="loading" class="text-center">
<div class="spinner-border" role="status"> <div class="spinner-border" role="status">
<span class="sr-only">Loading...</span> <span class="sr-only">Loading...</span>
@ -131,7 +132,7 @@
<div v-if="modes.infinite == true && !loading && feed.length > 0"> <div v-if="modes.infinite == true && !loading && feed.length > 0">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<infinite-loading @infinite="infiniteTimeline"> <infinite-loading @infinite="infiniteTimeline" distance="800">
<div slot="no-more" class="font-weight-bold">No more posts to load</div> <div slot="no-more" class="font-weight-bold">No more posts to load</div>
<div slot="no-results" class="font-weight-bold">No posts found</div> <div slot="no-results" class="font-weight-bold">No posts found</div>
</infinite-loading> </infinite-loading>
@ -152,8 +153,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-4 col-lg-4 pt-2 my-3 order-1 order-md-2 d-none d-md-block"> <div class="col-md-4 col-lg-4 pt-2 my-3 order-1 order-md-2 d-none d-md-block">
<div class="position-sticky" style="top:68px;">
<div class="mb-4"> <div class="mb-4">
<div class=""> <div class="">
<div class=""> <div class="">
@ -260,7 +263,8 @@
</footer> </footer>
</div> </div>
</div> </div>
<b-modal ref="followingModal" </div>
<!-- <b-modal ref="followingModal"
id="following-modal" id="following-modal"
hide-footer hide-footer
centered centered
@ -323,7 +327,7 @@
<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p> <p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
</div> </div>
</div> </div>
</b-modal> </b-modal> -->
<b-modal <b-modal
id="lightbox" id="lightbox"
ref="lightboxModal" ref="lightboxModal"