UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-21 08:48:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'frontend-ui-refactor' into patch-8

Browse source
This commit is contained in:
Stasiek Michalski 2018-06-04 00:31:20 +02:00 committed by GitHub
commit 7bc6e73f81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/StatusController.php
View file

@ -13,7 +13,9 @@ class StatusController extends Controller
public function show(Request $request, $username, int $id) public function show(Request $request, $username, int $id)
{ {
$user = Profile::whereUsername($username)->firstOrFail(); $user = Profile::whereUsername($username)->firstOrFail();
$status = Status::whereProfileId($user->id)->findOrFail($id); $status = Status::whereProfileId($user->id)
->withCount('likes')
->findOrFail($id);
if(!$status->media_path && $status->in_reply_to_id) { if(!$status->media_path && $status->in_reply_to_id) {
return view('status.reply', compact('user', 'status')); return view('status.reply', compact('user', 'status'));
} }

BIN
public/css/app.css vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

11
resources/assets/sass/custom.scss vendored
View file

@ -56,25 +56,14 @@ body, button, input, textarea {
} }
.card.status-container .status-photo { .card.status-container .status-photo {
display: block !important;
margin: auto !important; margin: auto !important;
} }
.card.status-container .status-comments { .card.status-container .status-comments {
height: 220px;
overflow-y: scroll; overflow-y: scroll;
border-bottom:1px solid rgba(0, 0, 0, 0.1); border-bottom:1px solid rgba(0, 0, 0, 0.1);
} }
.card.status-container.orientation-square .status-comments {
height: 360px !important;
}
.card.status-container.orientation-portrait .status-comments {
height: 528px !important;
}
.no-caret.dropdown-toggle { .no-caret.dropdown-toggle {
text-decoration: none !important; text-decoration: none !important;
} }

8
resources/views/layouts/partial/footer.blade.php
View file

@ -1,6 +1,6 @@
<footer class="pt-5 mt-5"> <footer>
<div class="container mt-5 pt-5"> <div class="container mt-5">
<p class="mt-5 text-uppercase font-weight-bold small"> <p class="text-uppercase font-weight-bold small">
<a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a> <a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a>
<a href="{{route('site.help')}}" class="text-primary pr-2">Support</a> <a href="{{route('site.help')}}" class="text-primary pr-2">Support</a>
<a href="" class="text-primary pr-2">API</a> <a href="" class="text-primary pr-2">API</a>
@ -14,4 +14,4 @@
<a href="#" class="text-dark float-right">© {{date('Y')}} PixelFed.org</a> <a href="#" class="text-dark float-right">© {{date('Y')}} PixelFed.org</a>
</p> </p>
</div> </div>
</footer> </footer>

2
resources/views/profile/followers.blade.php
View file

@ -42,7 +42,7 @@
</div> </div>
</div> </div>
<div class="col-12 col-md-8 offset-2"> <div class="col-12 col-md-8 offset-md-2">
@if($followers->count() !== 0) @if($followers->count() !== 0)
<ul class="list-group mt-4"> <ul class="list-group mt-4">
@foreach($followers as $user) @foreach($followers as $user)

2
resources/views/profile/following.blade.php
View file

@ -42,7 +42,7 @@
</div> </div>
</div> </div>
<div class="col-12 col-md-8 offset-2"> <div class="col-12 col-md-8 offset-md-2">
@if($following->count() !== 0) @if($following->count() !== 0)
<ul class="list-group mt-4"> <ul class="list-group mt-4">
@foreach($following as $user) @foreach($following as $user)

4
resources/views/status/show.blade.php
View file

@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div class="timestamp mb-0"> <div class="timestamp mb-0">
<p class="small text-uppercase mb-0"><a href="{{$status->url()}}" class="text-muted">{{$status->created_at->diffForHumans()}}</a></p> <p class="small text-uppercase mb-0"><a href="{{$status->url()}}" class="text-muted">{{$status->created_at->diffForHumans(null, true, true, true)}}</a></p>
</div> </div>
</div> </div>
<div class="card-body status-comments"> <div class="card-body status-comments">
@ -65,7 +65,7 @@
</span> </span>
</div> </div>
<div class="likes font-weight-bold mb-0"> <div class="likes font-weight-bold mb-0">
<span class="like-count">{{$status->likes()->count()}}</span> likes <span class="like-count">{{$status->likes_count}}</span> likes
</div> </div>
</div> </div>
<div class="card-footer"> <div class="card-footer">