shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1467 from denisdulici/master

Browse Source 
Missing avatar styling
This commit is contained in:
Denis Duliçi 2020-06-04 19:59:46 +03:00 committed by GitHub
commit 5ccec6e80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/custom.css vendored
View File

@ -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;

8
resources/views/auth/users/index.blade.php
View File

@ -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>

6
resources/views/partials/admin/navbar.blade.php
View File

@ -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))