From 11b8929b8bb4d374512375a24667b44e1bef6ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 4 Jun 2020 19:57:15 +0300
Subject: [PATCH] missing avatar styling

---
 public/css/custom.css                           | 7 +++++++
 resources/views/auth/users/index.blade.php      | 8 ++++----
 resources/views/partials/admin/navbar.blade.php | 6 +++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index a5350ff4f..8491b2c9d 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -275,6 +275,13 @@ tbody .row {
 }
 /*--------Item Column Image Finish--------*/
 
+/*--------User Column Image--------*/
+.user-img {
+    width: 36px;
+    height: 36px;
+}
+/*--------User Column Image Finish--------*/
+
 /*--------Border--------*/
 .border-1 {
     border: 1px solid #e5e5e5 !important;
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index 7267a4c65..615afd749 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -54,11 +54,11 @@
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-3">
                                 <a class="col-aka" href="{{ route('users.edit', $item->id) }}">
                                     @if (setting('default.use_gravatar', '0') == '1')
-                                        <img src="{{ $item->picture }}" alt="{{ $item->name }}" title="{{ $item->name }}">
+                                        <img src="{{ $item->picture }}" alt="{{ $item->name }}" class="rounded-circle user-img p-1 mr-3 hidden-md" title="{{ $item->name }}">
+                                    @elseif ($item->picture)
+                                        <img src="{{ Storage::url($item->picture->id) }}" class="rounded-circle user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}" title="{{ $item->name }}">
                                     @else
-                                        @if ($item->picture)
-                                            <img src="{{ Storage::url($item->picture->id) }}" alt="{{ $item->name }}" title="{{ $item->name }}">
-                                        @endif
+                                        <img src="{{ asset('public/img/user.svg') }}" class="user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}"/>
                                     @endif
                                     {{ $item->name }}
                                 </a>
diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index 7ff7e5e7b..81f3cffba 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -211,7 +211,11 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                         <div class="media align-items-center">
-                            <img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
+                            @if ($user->picture)
+                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
+                            @else
+                                <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
+                            @endif
                             <div class="media-body ml-2 d-none d-lg-block">
                                 <span class="mb-0 text-sm  font-weight-bold">
                                     @if (!empty($user->name))