diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php index 0a78f8b4caf9..cae4251c57b7 100644 --- a/app/Mail/Engine/PaymentEmailEngine.php +++ b/app/Mail/Engine/PaymentEmailEngine.php @@ -390,19 +390,28 @@ class PaymentEmailEngine extends BaseEmailEngine { return ' - - - - - - -
- - '. $text .' - -
- + + + + + + +
+ + '. $text .' + +
+ '; + return ' diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index dacb2972383f..e4ea76dcc968 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -984,10 +984,10 @@ html {
- +
- diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php index b40944ba8c0b..95112fc6bda1 100644 --- a/app/Utils/VendorHtmlEngine.php +++ b/app/Utils/VendorHtmlEngine.php @@ -808,21 +808,30 @@ html { private function buildViewButton(string $link, string $text): string { return ' - -
- + + '. $text .'
- - - - -
- - '. $text .' - -
- + + + + + + +
+ + '. $text .' + +
+ '; + return ' diff --git a/resources/views/email/admin/generic.blade.php b/resources/views/email/admin/generic.blade.php index 2f18f3d4b6c3..ece82a8c9057 100644 --- a/resources/views/email/admin/generic.blade.php +++ b/resources/views/email/admin/generic.blade.php @@ -27,17 +27,28 @@ @endisset @isset($url) - - -
- -
- - {{ ctrans($button) }} + + + + + + +
+ + {{ ctrans($button) }} +
+ + @endisset diff --git a/resources/views/email/template/admin.blade.php b/resources/views/email/template/admin.blade.php index 34f9de1e7858..814b1cbd67fa 100644 --- a/resources/views/email/template/admin.blade.php +++ b/resources/views/email/template/admin.blade.php @@ -1,5 +1,6 @@ @php $primary_color = isset($settings) ? $settings->primary_color : '#4caf50'; + $email_alignment = isset($settings) ? $settings->email_alignment : 'center'; @endphp email_style === 'dark') body, [data-ogsc] { background-color: #1a1a1a !important; color: #ffffff !important; } - div, tr, td, [data-ogsc] div, [data-ogsc] tr, [data-ogsc] td { border-color: #222222 !important; } - h1, h2, h3, p, td, [data-ogsc] h1, [data-ogsc] h2, [data-ogsc] h3, [data-ogsc] p, [data-ogsc] td, { color: #ffffff !important; } - p, [data-ogsc] p { color: #bbbbbc !important; } - .dark-bg-base, [data-ogsc] .dark-bg-base { background-color: #222222 !important; } - .dark-bg, [data-ogsc] .dark-bg { background-color: #3a3a3c !important; } - .logo-dark, [data-ogsc] .logo-dark { display: block !important; } - .logo-light, [data-ogsc] .logo-light { display: none !important; } - .btn-white, [data-ogsc] .btn-white { - background-color: #fefefe !important; + background-color: #000 !important; mso-padding-alt: 40px; mso-border-alt: 40px solid #fefefe; mso-padding-alt: 0; @@ -77,17 +69,6 @@ mso-border-right-alt: 20 #fefefe 0; } @endif - - .btn-white { - mso-padding-alt: 40px; - mso-border-alt: 40px solid #fefefe; - mso-padding-alt: 0; - mso-ansi-font-size:20px !important; - mso-line-height-alt:150%; - mso-border-left-alt: 20 #FFFFFF 0; - mso-border-right-alt: 20 #FFFFFF 0; - } - /** Content-specific styles. **/ #content .button { display: inline-block; @@ -101,7 +82,6 @@ font-weight: 600; margin-bottom: 30px; } - #content h1 { font-family: 'canada-type-gibson', 'roboto', Arial, Helvetica, sans-serif; font-weight: 600; @@ -109,16 +89,13 @@ margin-top: 5px; margin-bottom: 30px; } - #content > p { font-size: 16px; color: red; } - #content .center { text-align: center; } - .stamp { transform: rotate(12deg); color: #555; @@ -135,7 +112,6 @@ position: fixed; text-align: center; } - .is-paid { color: #D23; border: 1rem double #D23; @@ -149,14 +125,10 @@ position: fixed; } - .new_button, a { + .new_button a { background-color: {{ $primary_color }}; } - a:visited { - color:#ffffff !important; - } - @@ -165,18 +137,35 @@
- +
- + + @@ -189,76 +178,78 @@ -
-
- alt_text +
+ +
+
+
+ + + + + +
+ style="padding: 20px; text-align: {{ $email_alignment }}"> {{ $slot }}
+ style="background-color: {{ $primary_color }};" width="100%"> +

Questions? We're here to help!

- 		+ + + Support Docs + -
+ style="background-color: #242424;">

© {{ date('Y') }} Invoice Ninja, All Rights Reserved @@ -272,4 +263,4 @@

- + \ No newline at end of file diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index d5b3871ad519..f50d6327e54c 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -82,7 +82,6 @@ #content .left { text-align: left !important; } - .stamp { transform: rotate(12deg); color: #555; @@ -96,7 +95,6 @@ z-index:200 !important; position: relative; } - .is-paid { color: #D23; border: 1rem double #D23; @@ -109,20 +107,15 @@ z-index:200 !important; position: relative; } - a.doc_links { text-decoration: none; padding-bottom: 10px; display: inline-block; color: inherit !important; } - - .new_button, a { - background-color: {{ $primary_color }} !important; - } - - a:visited { - color:#ffffff !important; + + .new_button a { + background-color: {{ $primary_color }}; } @@ -139,38 +132,46 @@ - +
- +
- + + - - -
-
- alt_text +
+
+
+ + + +
-
+
+
+
{{ $slot ?? '' }} {!! $body ?? '' !!}
@isset($links) - - @if(count($links) >=1) -

{{ ctrans('texts.attachments') }}

- @endif - @foreach($links as $link) {!! $link ?? '' !!}
@endforeach @@ -182,20 +183,14 @@
-
+
+ style="text-align: center; padding-top: 10px; padding-bottom: 25px; background-color: #f9f9f9; border: 1px solid #c2c2c2; border-top: none; border-bottom-color: #f9f9f9;"> @isset($signature)

{!! nl2br($signature) !!} @@ -217,7 +212,7 @@

+ style="padding-top: 10px;padding-bottom: 10px; background-color: #242424; border: 1px solid #c2c2c2; border-top-color: #242424; border-bottom-color: #242424;"> @if(isset($company)) @if($company->account->isPaid())