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

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

View file

@ -13,7 +13,9 @@ class StatusController extends Controller
public function show(Request $request, $username, int $id)
{
$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) {
return view('status.reply', compact('user', 'status'));
}

BIN
public/css/app.css vendored

Binary file not shown.

Binary file not shown.

View file

@ -56,25 +56,14 @@ body, button, input, textarea {
}
.card.status-container .status-photo {
display: block !important;
margin: auto !important;
}
.card.status-container .status-comments {
height: 220px;
overflow-y: scroll;
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 {
text-decoration: none !important;
}

View file

@ -1,6 +1,6 @@
<footer class="pt-5 mt-5">
<div class="container mt-5 pt-5">
<p class="mt-5 text-uppercase font-weight-bold small">
<footer>
<div class="container mt-5">
<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.help')}}" class="text-primary pr-2">Support</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>
</p>
</div>
</footer>
</footer>

View file

@ -42,7 +42,7 @@
</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)
<ul class="list-group mt-4">
@foreach($followers as $user)

View file

@ -42,7 +42,7 @@
</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)
<ul class="list-group mt-4">
@foreach($following as $user)

View file

@ -19,7 +19,7 @@
</div>
</div>
<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 class="card-body status-comments">
@ -65,7 +65,7 @@
</span>
</div>
<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 class="card-footer">