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
commit e7613ddd6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 237 additions and 233 deletions

View file

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

BIN
public/js/timeline.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -2,6 +2,7 @@
<div class="container" style="">
<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 style="padding-top:10px;">
<div v-if="loading" class="text-center">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
@ -131,7 +132,7 @@
<div v-if="modes.infinite == true && !loading && feed.length > 0">
<div class="card">
<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-results" class="font-weight-bold">No posts found</div>
</infinite-loading>
@ -152,8 +153,10 @@
</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="position-sticky" style="top:68px;">
<div class="mb-4">
<div class="">
<div class="">
@ -260,7 +263,8 @@
</footer>
</div>
</div>
<b-modal ref="followingModal"
</div>
<!-- <b-modal ref="followingModal"
id="following-modal"
hide-footer
centered
@ -323,7 +327,7 @@
<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
</div>
</div>
</b-modal>
</b-modal> -->
<b-modal
id="lightbox"
ref="lightboxModal"