From 33ab1c987a523c497be37c2a6710948ff6f15090 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Mon, 4 Jun 2018 23:55:28 +0200
Subject: [PATCH 1/2] Add required html to improve status view

---
 resources/views/status/show.blade.php | 103 +++++++++++++++-----------
 1 file changed, 59 insertions(+), 44 deletions(-)

diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 3060f9ce2..1459ba245 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -5,11 +5,24 @@
 <div class="container px-0 mt-md-4">
   <div class="card status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
     <div class="row mx-0">
+    <div class="d-flex d-md-none align-items-center justify-content-between card-header w-100">
+      <div class="d-flex align-items-center status-username">
+        <div class="status-avatar mr-2">
+          <img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
+        </div>
+        <div class="username">
+          <a href="{{$user->url()}}" class="username-link font-weight-bold text-dark">{{$user->username}}</a>
+        </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(null, true, true, true)}}</a></p>
+       </div>
+     </div>
       <div class="col-12 col-md-8 status-photo px-0">
         <img src="{{$status->mediaUrl()}}" width="100%">
       </div>
       <div class="col-12 col-md-4 px-0 d-flex flex-column">
-        <div class="d-flex align-items-center justify-content-between card-header">
+        <div class="d-md-flex d-none align-items-center justify-content-between card-header">
           <div class="d-flex align-items-center status-username">
             <div class="status-avatar mr-2">
               <img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
@@ -22,59 +35,61 @@
             <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">
-          <div class="status-comment">
-            <p class="mb-1">
-              <span class="font-weight-bold pr-1">{{$status->profile->username}}</span>
-              <span class="comment-text">{!! $status->rendered ?? e($status->caption) !!}</span>
-            </p>
-            <div class="comments">
-              @foreach($status->comments->reverse()->take(10) as $item)
-              <p class="mb-0">
-                <span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="{{$item->profile->url()}}">{{$item->profile->username}}</a></bdi></span>
-                <span class="comment-text">{!!$item->rendered!!} <a href="{{$item->url()}}" class="text-dark small font-weight-bold float-right">{{$item->created_at->diffForHumans(null, true, true ,true)}}</a></span>
+        <div class="d-flex flex-md-column flex-column-reverse h-100">
+          <div class="card-body status-comments">
+            <div class="status-comment">
+              <p class="mb-1">
+                <span class="font-weight-bold pr-1">{{$status->profile->username}}</span>
+                <span class="comment-text">{!! $status->rendered ?? e($status->caption) !!}</span>
               </p>
-              @endforeach
+              <div class="comments">
+                @foreach($status->comments->reverse()->take(10) as $item)
+                <p class="mb-0">
+                  <span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="{{$item->profile->url()}}">{{$item->profile->username}}</a></bdi></span>
+                  <span class="comment-text">{!!$item->rendered!!} <a href="{{$item->url()}}" class="text-dark small font-weight-bold float-right">{{$item->created_at->diffForHumans(null, true, true ,true)}}</a></span>
+                </p>
+                @endforeach
+              </div>
             </div>
           </div>
-        </div>
-        <div class="card-body flex-grow-0">
-          <div class="reactions h3 mb-0">
-            <form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
-              @csrf
-              <input type="hidden" name="item" value="{{$status->id}}">
-              <button class="btn btn-link text-dark p-0" type="submit">
-                <span class="far fa-heart fa-lg mb-0"></span>
-              </button>
-            </form>
-            <span class="far fa-comment fa-lg pt-1 pr-3"></span>
-            @if(Auth::check())
-            @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
-            <form method="post" action="/i/delete" class="d-inline-flex">
-              @csrf
-              <input type="hidden" name="type" value="post">
-              <input type="hidden" name="item" value="{{$status->id}}">
-              <button type="submit" class="btn btn-link text-dark p-0">
-                <span class="far fa-trash-alt fa-lg mb-0"></span>
-              </button>
-            </form>
-            @endif
-            @endif
-            <span class="float-right">
-              <form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
+          <div class="card-body flex-grow-0">
+            <div class="reactions h3 mb-0">
+               <form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
                 @csrf
                 <input type="hidden" name="item" value="{{$status->id}}">
                 <button class="btn btn-link text-dark p-0" type="submit">
-                  <span class="far fa-bookmark fa-lg mb-0"></span>
+                  <span class="far fa-heart fa-lg mb-0"></span>
                 </button>
               </form>
-            </span>
-          </div>
-          <div class="likes font-weight-bold mb-0">
-            <span class="like-count" data-count="{{$status->likes_count}}">{{$status->likes_count}}</span> likes
+              <span class="far fa-comment fa-lg pt-1 pr-3"></span>
+              @if(Auth::check())
+              @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
+              <form method="post" action="/i/delete" class="d-inline-flex">
+                @csrf
+                <input type="hidden" name="type" value="post">
+                <input type="hidden" name="item" value="{{$status->id}}">
+                <button type="submit" class="btn btn-link text-dark p-0">
+                  <span class="far fa-trash-alt fa-lg mb-0"></span>
+                </button>
+              </form>
+              @endif
+              @endif
+              <span class="float-right">
+                <form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
+                  @csrf
+                  <input type="hidden" name="item" value="{{$status->id}}">
+                  <button class="btn btn-link text-dark p-0" type="submit">
+                    <span class="far fa-bookmark fa-lg mb-0"></span>
+                  </button>
+                </form>
+              </span>
+            </div>
+            <div class="likes font-weight-bold mb-0">
+              <span class="like-count" data-count="{{$status->likes_count}}">{{$status->likes_count}}</span> likes
+            </div>
           </div>
         </div>
-        <div class="card-footer">
+        <div class="card-footer bg-light sticky-md-bottom">
           <form class="comment-form" method="post" action="/i/comment" data-id="{{$status->id}}" data-truncate="false">
             @csrf
             <input type="hidden" name="item" value="{{$status->id}}">

From 78fe6758c960ff0f4b2aece61f5665d42c2ec73b Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Tue, 5 Jun 2018 00:04:56 +0200
Subject: [PATCH 2/2] Add needed classes to status view

---
 resources/assets/sass/custom.scss | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss
index cb3bf28ac..1ea793f09 100644
--- a/resources/assets/sass/custom.scss
+++ b/resources/assets/sass/custom.scss
@@ -59,9 +59,12 @@ body, button, input, textarea {
   margin: auto !important;
 }
 
-.card.status-container .status-comments {
-  overflow-y: scroll;
-  border-bottom:1px solid rgba(0, 0, 0, 0.1);
+@media (min-width: map-get($grid-breakpoints, "md")) {
+  .card.status-container .status-comments {
+    overflow-y:scroll;
+    border-bottom:1px solid rgba(0,0,0,.1);
+    height: 200px;
+  }
 }
 
 .no-caret.dropdown-toggle {
@@ -165,4 +168,19 @@ body, button, input, textarea {
 }
 
 .fas.fa-heart {
-}
\ No newline at end of file
+}
+
+@media (max-width: map-get($grid-breakpoints, "md")) {
+  .border-md-left-0 {
+    border-left:0!important
+  }
+  .card.status-container .status-comments {
+    border-top:1px solid rgba(0,0,0,.1);
+  }
+  .sticky-md-bottom {
+    position:-webkit-sticky;
+    position:sticky;
+    bottom:0;
+    z-index:1020
+  }
+}