From e32929029b3b9c4cfdd40fe234f530c60efa84e1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 26 May 2021 17:09:56 +0100
Subject: [PATCH] Added app logo to outgoing emails

Required changing the header bar of the email to be solid color to match
the configuration of the main app header since otherwise colors may not
work together.

Closes #2577
---
 .../vendor/notifications/email.blade.php      | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index f73b87b59..8395ff0e1 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -35,10 +35,10 @@ $style = [
 
     /* Masthead ----------------------- */
 
-    'email-masthead' => 'padding: 25px 0; text-align: center;',
-    'email-masthead_name' => 'font-size: 24px; font-weight: 400; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
+    'email-masthead' => 'padding: 18px 0; text-align: left;',
+    'email-masthead_name' => 'font-size: 24px; font-weight: 400; color: #FFFFFF; text-decoration: none;',
 
-    'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 4px solid '.setting('app-color').'; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
+    'email-body' => 'width: 100%; margin: 0; padding: 0; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
     'email-body_inner' => 'width: auto; max-width: 100%; margin: 0 auto; padding: 0;',
     'email-body_cell' => 'padding: 35px;',
 
@@ -82,10 +82,33 @@ $style = [
                             <table width="100%" cellpadding="0" cellspacing="0">
                                 <!-- Logo -->
                                 <tr>
-                                    <td style="{{ $style['email-masthead'] }}">
-                                        <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
-                                            {{ setting('app-name') }}
-                                        </a>
+                                    <td bgcolor="{{ setting('app-color') }}">
+                                        <table width="100%" cellpadding="0" cellspacing="0">
+                                            <tr>
+                                                <td width="35">&nbsp;</td>
+                                                <td>
+                                                    <table width="100%" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            @if(setting('app-logo', '') !== 'none')
+                                                                <td valign="middle" style="padding-right: 12px; padding-top: 4px; padding-bottom: 4px;">
+                                                                    <a style="border: none; vertical-align: middle; display: inline-block;" href="{{ url('/') }}" target="_blank">
+                                                                        <img class="logo-image" height="43"
+                                                                             src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}"
+                                                                             alt="Logo">
+                                                                    </a>
+                                                                </td>
+                                                            @endif
+                                                            <td width="90%" valign="middle" style="{{ $style['email-masthead'] }}">
+                                                                <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
+                                                                    {{ setting('app-name') }}
+                                                                </a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                <td width="35">&nbsp;</td>
+                                            </tr>
+                                        </table>
                                     </td>
                                 </tr>