From 6c0817a5729823cc688b0b2a9f7832fe1dfef3ed Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:06:26 -0500 Subject: [PATCH 1/8] Fix #156 --- resources/assets/sass/custom.scss | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index a972f29d1..c40880736 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -61,32 +61,10 @@ body, button, input, textarea { } .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; -} - -.card.status-container.orientation-landscape .status-photo img { - max-height: 451px !important; -} - -.card.status-container.orientation-square .status-photo img { - max-height: 601px !important; -} - -.card.status-container.orientation-portrait .status-photo img { - max-height: 772px !important; -} - .no-caret.dropdown-toggle { text-decoration: none !important; } From b1a46f9b1596a865a2683c26ea8a9d4b7102c28b Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:17:27 -0500 Subject: [PATCH 2/8] Remove unnecessary block definition Default display model is already block, so need to redefine it --- resources/assets/sass/custom.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index c40880736..99ceeb8da 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -56,7 +56,6 @@ body, button, input, textarea { } .card.status-container .status-photo { - display: block !important; margin: auto !important; } From 32fa4c2e0b2f38391fd8647665a8fa9659201c8d Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:20:06 -0500 Subject: [PATCH 3/8] Singular footer margin Remove complexity and unnecessarily large gap --- resources/views/layouts/partial/footer.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 @@ - From 89646cf1c67092fb5ea0815dbf2b1e7199e93b26 Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:44:29 -0500 Subject: [PATCH 4/8] Offset only for md layout (followers) Fix #160 for followers list --- resources/views/profile/followers.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)
    @foreach($followers as $user) From 48240d319cc2a8031a7119b26dc0a33daec3ef2f Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:46:25 -0500 Subject: [PATCH 5/8] Define offset only for md layout (following) Fix #160 for following list --- resources/views/profile/following.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 27aae9eca..e7909cb98 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -42,7 +42,7 @@
-
+
@if($following->count() !== 0)
    @foreach($following as $user) From d13f73db956e83f8f0e0bfd2d7733b896c788123 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 00:55:05 -0600 Subject: [PATCH 6/8] Update compiled assets --- public/css/app.css | Bin 158641 -> 158172 bytes public/mix-manifest.json | Bin 184 -> 184 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 2da738eaa3442eff712d66652fdc524534c26756..9342d305f1b90a356b4da3fbca02d5aab9538604 100644 GIT binary patch delta 34 qcmdmZo%7CR&W0AoEllqcrVF|NPWf>9s)7i{WOhy3NgvfHqG~WK!8)m&g>y0RWSsi+lh8 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7d075bc34ac918703825ec142db010309796cbf8..7caf1148de0f5927d09421874fd236610731ab01 100644 GIT binary patch delta 30 lcmdnNxPx&*yoga^N>Ykxa!R6+iK&5!kx62rf!V}jR{)m|31$EQ delta 30 lcmdnNxPx&*yhxgbNt%g)VQP}8xsjn+s Date: Sun, 3 Jun 2018 01:00:16 -0600 Subject: [PATCH 7/8] Update status view --- resources/views/status/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 7e6ddc5dd..b427b4847 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -19,7 +19,7 @@
-

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

+

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

From 6d5c8fb90a2de5532f62919393af6724b8328931 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 01:15:38 -0600 Subject: [PATCH 8/8] Fix n+1 query in status view --- app/Http/Controllers/StatusController.php | 4 +++- resources/views/status/show.blade.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index b427b4847..0b0d7ab69 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -65,7 +65,7 @@