diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php index c7aae1b8..9d14d9b1 100644 --- a/resources/views/vendor/mail/html/button.blade.php +++ b/resources/views/vendor/mail/html/button.blade.php @@ -7,7 +7,7 @@
- {{ $slot }} + {{ $slot }}
diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php index 991ae52a..859900a3 100644 --- a/resources/views/vendor/mail/html/layout.blade.php +++ b/resources/views/vendor/mail/html/layout.blade.php @@ -27,7 +27,7 @@ - {{ $header or '' }} + {{ $header ?? '' }} @@ -38,14 +38,14 @@
{{ Illuminate\Mail\Markdown::parse($slot) }} - {{ $subcopy or '' }} + {{ $subcopy ?? '' }}
- {{ $footer or '' }} + {{ $footer ?? '' }} diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index 49f7470c..5d10c041 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -21,7 +21,7 @@ {{-- Footer --}} @slot('footer') @component('mail::footer') - © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. All rights reserved. + © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. @lang('All rights reserved.') @endcomponent @endslot @endcomponent diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css index 20659933..aa4afb26 100644 --- a/resources/views/vendor/mail/html/themes/default.css +++ b/resources/views/vendor/mail/html/themes/default.css @@ -182,6 +182,7 @@ img { .table th { border-bottom: 1px solid #EDEFF2; padding-bottom: 8px; + margin: 0; } .table td { @@ -189,6 +190,7 @@ img { font-size: 15px; line-height: 18px; padding: 10px 0; + margin: 0; } .content-cell { @@ -216,7 +218,8 @@ img { -webkit-text-size-adjust: none; } -.button-blue { +.button-blue, +.button-primary { background-color: #3097D1; border-top: 10px solid #3097D1; border-right: 18px solid #3097D1; @@ -224,7 +227,8 @@ img { border-left: 18px solid #3097D1; } -.button-green { +.button-green, +.button-success { background-color: #2ab27b; border-top: 10px solid #2ab27b; border-right: 18px solid #2ab27b; @@ -232,7 +236,8 @@ img { border-left: 18px solid #2ab27b; } -.button-red { +.button-red, +.button-error { background-color: #bf5329; border-top: 10px solid #bf5329; border-right: 18px solid #bf5329; diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php index b565e690..5d10c041 100644 --- a/resources/views/vendor/mail/markdown/message.blade.php +++ b/resources/views/vendor/mail/markdown/message.blade.php @@ -21,7 +21,7 @@ {{-- Footer --}} @slot('footer') @component('mail::footer') - © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. All rights reserved. + © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. @lang('All rights reserved.') @endcomponent @endslot @endcomponent diff --git a/resources/views/vendor/notifications/email-plain.blade.php b/resources/views/vendor/notifications/email-plain.blade.php deleted file mode 100644 index acefa652..00000000 --- a/resources/views/vendor/notifications/email-plain.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - - +@component('mail::message') +{{-- Greeting --}} +@if (! empty($greeting)) +# {{ $greeting }} +@else +@if ($level === 'error') +# @lang('Whoops!') +@else +# @lang('Hello!') +@endif +@endif - - - +{{-- Intro Lines --}} +@foreach ($introLines as $line) +{{ $line }} - - +@endforeach +{{-- Action Button --}} +@isset($actionText) 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;', - 'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;', - - /* Masthead ----------------------- */ - - 'email-masthead' => 'padding: 25px 0; text-align: center;', - 'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;', - - 'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;', - 'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;', - 'email-body_cell' => 'padding: 35px;', - - 'email-footer' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;', - 'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;', - - /* Body ------------------------------ */ - - 'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;', - 'body_sub' => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;', - - /* Type ------------------------------ */ - - 'anchor' => "color: {$themeLinks};", - 'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;', - 'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;', - 'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;', - 'paragraph-center' => 'text-align: center;', - - /* Buttons ------------------------------ */ - - 'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px; - background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px; - text-align: center; text-decoration: none; -webkit-text-size-adjust: none;', - - 'button--green' => "background-color: {$themeGreens};", - 'button--red' => "background-color: {$themeReds};", - 'button--blue' => "background-color: {$themeBlues};", -]; + switch ($level) { + case 'success': + case 'error': + $color = $level; + break; + default: + $color = 'primary'; + } ?> +@component('mail::button', ['url' => $actionUrl, 'color' => $color]) +{{ $actionText }} +@endcomponent +@endisset - +{{-- Outro Lines --}} +@foreach ($outroLines as $line) +{{ $line }} - - - - - -
- - - - - +@endforeach - - - - - - - - - -
- - {{ setting('app_name', config('app.name')) }} - -
- - - - -
- -

- @if (! empty($greeting)) - {{ $greeting }} - @else - @if ($level == 'error') - Whoops! - @else - Hello! - @endif - @endif -

+{{-- Salutation --}} +@if (! empty($salutation)) +{{ $salutation }} +@else +@lang('Regards'),
{{ setting('app_name', config('app.name')) }} +@endif - - @foreach ($introLines as $line) -

- {{ $line }} -

- @endforeach - - - @if (isset($actionText)) - - - - -
- - - - {{ $actionText }} - -
- @endif - - - @foreach ($outroLines as $line) -

- {{ $line }} -

- @endforeach - - -

- Regards,
{{ setting('app_name', config('app.name')) }} -

- - - @if (isset($actionText)) - - - - -
-

- If you’re having trouble clicking the "{{ $actionText }}" button, - copy and paste the URL below into your web browser: -

- -

- - {{ $actionUrl }} - -

-
- @endif -
-
- - - - -
-

- © {{ date('Y') }} - {{ setting('app_name', config('app.name')) }}. - All rights reserved. -

-
-
-
- - +{{-- Subcopy --}} +@isset($actionText) +@component('mail::subcopy') +@lang( + "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n". + 'into your web browser: [:actionURL](:actionURL)', + [ + 'actionText' => $actionText, + 'actionURL' => $actionUrl, + ] +) +@endcomponent +@endisset +@endcomponent diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php index 3f984557..044bbaa4 100644 --- a/resources/views/vendor/pagination/bootstrap-4.blade.php +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -1,24 +1,28 @@ @if ($paginator->hasPages()) -