Merge branch 'scroll-to-solution'

Author: driesvints

resources/views/forum/overview.blade.php

@@ -53,14 +53,7 @@
                                     @include('forum.threads.info.tags')
                                 </div>
 
-                                @if ($thread->isSolved())
-                                    <a class="label label-primary text-center mt-4 md:mt-0"
-                                       href="{{ route('thread', $thread->slug()) }}#{{ $thread->solutionReplyRelation->id }}">
-                                        <i class="fa fa-check mr-2"></i>
-                                        View solution
-                                    </a>
-                                @endif
-
+                                @include('forum.threads._view_solution')
                             </div>
                         </div>
                     @endforeach

resources/views/forum/threads/_view_solution.blade.php

@@ -0,0 +1,8 @@
+@if ($thread->isSolved())
+    <a class="label label-primary text-center mt-4 md:mt-0"
+       href="{{ route('thread', $thread->slug()) }}#{{ $thread->solution_reply_id }}">
+        <i class="fa fa-check mr-2"></i>
+        View solution
+    </a>
+@endif
+

resources/views/forum/threads/show.blade.php

@@ -16,13 +16,19 @@
             <div class="w-full md:w-3/4 md:pr-3">
                 <div class="reply bg-white border rounded">
                     <div class="flex flex-col md:flex-row md:items-center text-sm p-4 border-b">
-                        <div class="flex mb-4 md:mb-0">
-                            @include('forum.threads.info.avatar', ['user' => $thread->author()])
-
-                            <div class="mr-6 text-gray-700">
-                                <a href="{{ route('profile', $thread->author()->username()) }}" class="text-green-darker mr-2">{{ $thread->author()->name() }}</a> posted
-                                {{ $thread->createdAt()->diffForHumans() }}
+                        <div class="flex flex-wrap mb-4 md:mb-0 justify-between w-full items-center">
+                            <div class="flex">
+                                @include('forum.threads.info.avatar', ['user' => $thread->author()])
+
+                                <div class="mr-6 mb-4 md:mb-0 text-gray-700">
+                                    <a href="{{ route('profile', $thread->author()->username()) }}"
+                                       class="text-green-darker mr-2">
+                                        {{ $thread->author()->name() }}
+                                    </a> posted {{ $thread->createdAt()->diffForHumans() }}
+                                </div>
                             </div>
+
+                            @include('forum.threads._view_solution')
                         </div>
 
                         @include('forum.threads.info.tags')