Date: Wed, 29 Apr 2020 22:27:43 +0000 (+0200) Subject: email color X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=34ec04c3c5ad971cc16f4359716d71604793658d;p=psq.git email color --- diff --git a/app/Notifications/RegistrationPending.php b/app/Notifications/RegistrationPending.php index d17d021..7c0398f 100644 --- a/app/Notifications/RegistrationPending.php +++ b/app/Notifications/RegistrationPending.php @@ -44,7 +44,6 @@ class RegistrationPending extends Notification implements ShouldQueue $link = $notifiable->routeWithToken('account.index', [], now()->addDays(14)); return (new MailMessage) - ->markdown('emails.notification') ->subject('Activation en attente') ->line("Nous avons remarquÃ© que votre compte n'est toujours pas activÃ©.") ->line("Veuillez cliquer sur ce lien pour crÃ©er votre mot de passe et ne rater aucun numÃ©ro de *Prescription SantÃ© : Le Quotidien* !") diff --git a/app/Notifications/Welcome.php b/app/Notifications/Welcome.php index 2ed452d..ad74414 100644 --- a/app/Notifications/Welcome.php +++ b/app/Notifications/Welcome.php @@ -42,8 +42,7 @@ class Welcome extends Notification implements ShouldQueue { $link = $notifiable->routeWithToken('account.index', [], now()->addDays(7)); return (new MailMessage) - ->markdown('emails.notification') - ->subject('Nouelle plateoforme Prescription SantÃ©') + ->subject('Nouvelle plateforme Prescription SantÃ©') ->line("Bonjour.......") ->line("Veuillez cliquer sur ce lien pour crÃ©er votre mot de passe et ne rater aucun numÃ©ro de *Prescription SantÃ© : Le Quotidien* !") ->line("Cela ne vous prendra pas plus d'une minute.") diff --git a/resources/views/emails/batch.blade.php b/resources/views/emails/batch.blade.php index e173ec5..7ef2bc1 100644 --- a/resources/views/emails/batch.blade.php +++ b/resources/views/emails/batch.blade.php @@ -1,18 +1,12 @@ @component('mail::message') -

-
- - - # LâÃDITION DU JOUR ## {{$subject}} {!! $content !!} - -@component('mail::button', ['url' => $link ?? '%recipient.file_url%', 'color' => 'success']) +@component('mail::button', ['url' => $link ?? '%recipient.file_url%', 'color' => 'primary']) Cliquez ici pour lire ! @endcomponent diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php index 02a54e2..73bdae7 100644 --- a/resources/views/vendor/mail/html/layout.blade.php +++ b/resources/views/vendor/mail/html/layout.blade.php @@ -1,54 +1,56 @@ - - + + - - +

- -{{ $header ?? '' }} + + + + + {{ $footer ?? '' }} +

+ +
+ {{ $header ?? '' }} - - - - + + + - + {{ $subcopy ?? '' }} + + +

- - - - - -

-{{ Illuminate\Mail\Markdown::parse($slot) }} -{{ $subcopy ?? '' }} -

+ + + +

+ {{ Illuminate\Mail\Markdown::parse($slot) }} -{{ $footer ?? '' }} -

diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index d992bc9..19b4d82 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -1,4 +1,6 @@ @component('mail::layout') +

+
{{-- Body --}} {{ $slot }} diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css index bbaa2fb..07364ae 100644 --- a/resources/views/vendor/mail/html/themes/default.css +++ b/resources/views/vendor/mail/html/themes/default.css @@ -27,8 +27,10 @@ blockquote { text-align: left; } + + a { - color: #3869d4; + color: #074e9c; } a img { @@ -38,7 +40,7 @@ a img { /* Typography */ h1 { - color: #3d4852; + color: #074e9c; font-size: 18px; font-weight: bold; margin-top: 0; @@ -46,6 +48,7 @@ h1 { } h2 { + color: #d04d4a; font-size: 16px; font-weight: bold; margin-top: 0; @@ -154,6 +157,7 @@ img { .subcopy p { font-size: 14px; + word-break: break-word; } /* Footer */ @@ -231,11 +235,11 @@ img { .button-blue, .button-primary { - background-color: #2d3748; - border-bottom: 8px solid #2d3748; - border-left: 18px solid #2d3748; - border-right: 18px solid #2d3748; - border-top: 8px solid #2d3748; + background-color: #074e9c; + border-bottom: 8px solid #074e9c; + border-left: 18px solid #074e9c; + border-right: 18px solid #074e9c; + border-top: 8px solid #074e9c; } .button-green, @@ -249,11 +253,11 @@ img { .button-red, .button-error { - background-color: #e53e3e; - border-bottom: 8px solid #e53e3e; - border-left: 18px solid #e53e3e; - border-right: 18px solid #e53e3e; - border-top: 8px solid #e53e3e; + background-color: #d04d4a; + border-bottom: 8px solid #d04d4a; + border-left: 18px solid #d04d4a; + border-right: 18px solid #d04d4a; + border-top: 8px solid #d04d4a; } /* Panels */