diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 317baf0b0..e1db420c8 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -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')); } diff --git a/public/css/app.css b/public/css/app.css index 2da738eaa..9342d305f 100644 Binary files a/public/css/app.css and b/public/css/app.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7d075bc34..7caf1148d 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 0a6b7f71e..99ceeb8da 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -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; } diff --git a/resources/views/layouts/partial/footer.blade.php b/resources/views/layouts/partial/footer.blade.php index 7cc7f6551..382d513b4 100644 --- a/resources/views/layouts/partial/footer.blade.php +++ b/resources/views/layouts/partial/footer.blade.php @@ -1,6 +1,6 @@ - diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 75ff0e939..59a4dc988 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -42,7 +42,7 @@ -
+
@if($followers->count() !== 0)
-
+
@if($following->count() !== 0)
-

{{$status->created_at->diffForHumans()}}

+

{{$status->created_at->diffForHumans(null, true, true, true)}}

@@ -65,7 +65,7 @@
- {{$status->likes()->count()}} likes + {{$status->likes_count}} likes