UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-12 17:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-08-10 00:31:27 -06:00 committed by GitHub
commit 8470cbf1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 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.1.3', 'version' => '0.1.4',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

28
resources/views/discover/tags/show.blade.php
View file

@ -7,7 +7,7 @@
<div class="profile-header row my-5"> <div class="profile-header row my-5">
<div class="col-12 col-md-3"> <div class="col-12 col-md-3">
<div class="profile-avatar"> <div class="profile-avatar">
<img class="img-thumbnail" src="https://placehold.it/300x300" style="border-radius:100%;" width="172px"> <img class="rounded-circle card" src="{{$posts->last()->thumb()}}" width="172px" height="172px">
</div> </div>
</div> </div>
<div class="col-12 col-md-9 d-flex align-items-center"> <div class="col-12 col-md-9 d-flex align-items-center">
@ -16,13 +16,13 @@
<span class="h1">{{$tag->name}}</span> <span class="h1">{{$tag->name}}</span>
</div> </div>
<p class="font-weight-bold"> <p class="font-weight-bold">
{{$count}} posts {{$tag->posts_count}} posts
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="profile-timeline mt-5 row"> <div class="tag-timeline row">
@foreach($posts as $status) @foreach($posts as $status)
<div class="col-12 col-md-4 mb-4"> <div class="col-12 col-md-4 mb-4">
<a class="card" href="{{$status->url()}}"> <a class="card" href="{{$status->url()}}">
@ -31,7 +31,9 @@
</div> </div>
@endforeach @endforeach
</div> </div>
<div class="d-flex justify-content-center pagination-container mt-4">
{{$posts->links()}}
</div>
</div> </div>
@endsection @endsection
@ -39,3 +41,21 @@
@push('meta') @push('meta')
<meta property="og:description" content="Discover {{$tag->name}}"> <meta property="og:description" content="Discover {{$tag->name}}">
@endpush @endpush
@push('scripts')
<script type="text/javascript">
$(document).ready(function() {
$('.pagination-container').hide();
$('.pagination').hide();
let elem = document.querySelector('.tag-timeline');
let infScroll = new InfiniteScroll( elem, {
path: '.pagination__next',
append: '.tag-timeline',
status: '.page-load-status',
history: true,
});
});
</script>
@endpush