DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixed #8810 - email logo was not being used in emails

Browse source
This commit is contained in:
snipe 2020-11-25 00:05:02 -08:00
parent 72fc03aa50
commit 76ee5a679b
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
resources/views/vendor/mail/html/message.blade.php vendored
View file

@ -5,18 +5,27 @@
@if (isset($snipeSettings) && ($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted())) @if (isset($snipeSettings) && ($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
@if ($snipeSettings->brand == '3') @if ($snipeSettings->brand == '3')
@if ($snipeSettings->logo!='')
<img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}"> @if ($snipeSettings->email_logo!='')
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
@elseif ($snipeSettings->logo!='')
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
@endif @endif
{{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }}
<br><br>
@elseif ($snipeSettings->brand == '2') @elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='') @if ($snipeSettings->email_logo!='')
<img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
@elseif ($snipeSettings->logo!='')
<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
@endif @endif
@else @else
{{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }}
@endif @endif
@else @else
Snipe-IT Snipe-IT
@endif @endif
@ -41,7 +50,7 @@ Snipe-IT
@if($snipeSettings::setupCompleted()) @if($snipeSettings::setupCompleted())
© {{ date('Y') }} {{ $snipeSettings->site_name }}. All rights reserved. © {{ date('Y') }} {{ $snipeSettings->site_name }}. All rights reserved.
@else @else
© {{ date('Y') }} Snipe-it. All rights reserved. © {{ date('Y') }} Snipe-IT. All rights reserved.
@endif @endif
@if ($snipeSettings->privacy_policy_link!='') @if ($snipeSettings->privacy_policy_link!='')

6
resources/views/vendor/mail/html/themes/default.css vendored
View file

@ -107,14 +107,16 @@ img {
.header { .header {
padding: 25px 0; padding: 25px 0;
text-align: center; text-align: center;
vertical-align: middle;
} }
.header a { .header a {
color: #bbbfc3; color: #2b2d30;
font-size: 19px; font-size: 25px;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
text-shadow: 0 1px 0 white; text-shadow: 0 1px 0 white;
vertical-align: middle;
} }
/* Body */ /* Body */