From a57c2290d3f8f85bba9970efc273b062ba8c75ff Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 19 Dec 2018 18:57:43 -0700
Subject: [PATCH] Update profile partials, fix img-thumbnail height bug

---
 .../profile/partial/private-info.blade.php    |  2 +-
 .../views/profile/partial/user-info.blade.php | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/resources/views/profile/partial/private-info.blade.php b/resources/views/profile/partial/private-info.blade.php
index 5c687a7c1..88ccc42c7 100644
--- a/resources/views/profile/partial/private-info.blade.php
+++ b/resources/views/profile/partial/private-info.blade.php
@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-12 col-md-4 d-flex">
         <div class="profile-avatar mx-auto">
-          <img class="img-thumbnail" src="{{$user->avatarUrl()}}" style="border-radius:100%;" width="172px">
+          <img class="rounded-circle box-shadow" src="{{$user->avatarUrl()}}" width="172px" height="172px">
         </div>
       </div>
       <div class="col-12 col-md-8 d-flex align-items-center">
diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php
index 3ca87c999..aa899e66d 100644
--- a/resources/views/profile/partial/user-info.blade.php
+++ b/resources/views/profile/partial/user-info.blade.php
@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-12 col-md-4 d-flex">
         <div class="profile-avatar mx-auto">
-          <img class="img-thumbnail" src="{{$user->avatarUrl()}}" style="border-radius:100%;" width="172px">
+          <img class="rounded-circle box-shadow" src="{{$user->avatarUrl()}}" width="172px" height="172px">
         </div>
       </div>
       <div class="col-12 col-md-8 d-flex align-items-center">
@@ -36,24 +36,27 @@
               </form>
             </span>
             @endif
-            {{-- TODO: Implement action dropdown
-            <span class="pl-4">
+            {{-- <span class="pl-4">
               <div class="dropdown">
-                <button class="btn btn-secondary dropdown-toggle py-0" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <i class="icon-options"></i>
+                <button class="btn btn-link text-muted dropdown-toggle py-0" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="text-decoration: none;">
+                <i class="fas fa-ellipsis-v"></i>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                  <a class="dropdown-item" href="#">Report User</a>
-                  <a class="dropdown-item" href="#">Block User</a>
+                  <a class="dropdown-item font-weight-bold" href="#">Report User</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item font-weight-bold" href="#">Mute User</a>
+                  <a class="dropdown-item font-weight-bold" href="#">Block User</a>
+                  <a class="dropdown-item font-weight-bold mute-users" href="#">Mute User & User Followers</a>
+                  <a class="dropdown-item font-weight-bold" href="#">Block User & User Followers</a>
                 </div>
               </div>
             </span>
-            --}}
+           --}}
           </div>
           <div class="profile-stats pb-3 d-inline-flex lead">
             <div class="font-weight-light pr-5">
               <a class="text-dark" href="{{$user->url()}}">
-              <span class="font-weight-bold">{{$user->statuses()->whereNull('reblog_of_id')->whereNull('in_reply_to_id')->count()}}</span> 
+              <span class="font-weight-bold">{{$user->statusCount()}}</span> 
               Posts
               </a>
             </div>
@@ -74,13 +77,13 @@
             </div>
             @endif
           </div>
-          <p class="lead mb-0">
-            <span class="font-weight-bold">{{$user->name}}</span> 
+          <p class="lead mb-0 d-flex align-items-center">
+            <span class="font-weight-bold pr-3">{{$user->name}}</span> 
             @if($user->remote_url)
-            <span class="badge badge-info">REMOTE PROFILE</span>
+            <span class="btn btn-outline-secondary btn-sm py-0">REMOTE PROFILE</span>
             @endif
           </p>
-          <p class="mb-0 lead">{{$user->bio}}</p>
+          <div class="mb-0 lead" v-pre>{!!str_limit($user->bio, 127)!!}</div>
           <p class="mb-0"><a href="{{$user->website}}" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{str_limit($user->website, 30)}}</a></p>
         </div>
       </div>