]> _ Git - psq.git/commitdiff
projects / psq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce752d5)
email color
authorLouis Jeckel <louis.jeckel@outlook.cm>
Wed, 29 Apr 2020 22:27:43 +0000 (00:27 +0200)
committerLouis Jeckel <louis.jeckel@outlook.cm>
Wed, 29 Apr 2020 22:27:43 +0000 (00:27 +0200)
app/Notifications/RegistrationPending.php patch | blob | history
app/Notifications/Welcome.php patch | blob | history
resources/views/emails/batch.blade.php patch | blob | history
resources/views/vendor/mail/html/layout.blade.php patch | blob | history
resources/views/vendor/mail/html/message.blade.php patch | blob | history
resources/views/vendor/mail/html/themes/default.css patch | blob | history

diff --git a/app/Notifications/RegistrationPending.php b/app/Notifications/RegistrationPending.php
index d17d021ce483671e6e470ddd16e7bccb1acbc0e8..7c0398fe8d53d4f522743743bdc4978eb40ac7b0 100644 (file)
--- 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 2ed452d60671d94defd2d87973025d79d919b7a3..ad744140096c270ac16bfd44f706684d01360b67 100644 (file)
--- 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 e173ec531468679acc56e044beaf04272c866e51..7ef2bc1b771e475e9ced1a76363c705e5cf9608c 100644 (file)
--- a/resources/views/emails/batch.blade.php
+++ b/resources/views/emails/batch.blade.php
@@ -1,18 +1,12 @@
 @component('mail::message')
 
-<img src="{{ Asset::public('logo.jpg')  }}" alt="PSQ Logo" width="570" style="max-width: 100%; margin-bottom: 20px;" >
-<br>
-
-
-
 # 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 02a54e2da78015d9ea8d07a74f70ea10dc9a4051..73bdae76e0697d29039fc43faa1aa3004a3e0454 100644 (file)
--- a/resources/views/vendor/mail/html/layout.blade.php
+++ b/resources/views/vendor/mail/html/layout.blade.php
@@ -1,54 +1,56 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 <style>
-@media only screen and (max-width: 600px) {
-.inner-body {
-width: 100% !important;
-}
+    @media only screen and (max-width: 600px) {
+        .inner-body {
+            width: 100% !important;
+        }
 
-.footer {
-width: 100% !important;
-}
-}
+        .footer {
+            width: 100% !important;
+        }
+    }
 
-@media only screen and (max-width: 500px) {
-.button {
-width: 100% !important;
-}
-}
+    @media only screen and (max-width: 500px) {
+        .button {
+            width: 100% !important;
+        }
+    }
 </style>
 
 <table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-{{ $header ?? '' }}
+    <tr>
+        <td align="center">
+            <table class="content" width="100%" cellpadding="" cellspacing="0" role="presentation">
+                <br>
+            {{ $header ?? '' }}
 
-<!-- Email Body -->
-<tr>
-<td class="body" width="100%" cellpadding="0" cellspacing="0">
-<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-<!-- Body content -->
-<tr>
-<td class="content-cell">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
 
-{{ $subcopy ?? '' }}
-</td>
-</tr>
-</table>
-</td>
-</tr>
+            <!-- Email Body -->
+                <tr>
+                    <td class="body" width="100%" cellpadding="0" cellspacing="0">
+                        <table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+                            <!-- Body content -->
+                            <tr>
+                                <td class="content-cell">
+                                    {{ Illuminate\Mail\Markdown::parse($slot) }}
 
-{{ $footer ?? '' }}
-</table>
-</td>
-</tr>
+                                    {{ $subcopy ?? '' }}
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                {{ $footer ?? '' }}
+            </table>
+        </td>
+    </tr>
 </table>
 </body>
 </html>
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index d992bc9bf8d6d0f69ed27cebc57c21b43c18b632..19b4d8293fdafe6b4ea130640bc816eee2c67ab3 100644 (file)
--- 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')
+<img src="{{ Asset::public('logo.jpg')  }}" alt="PSQ Logo" width="570" style="max-width: 100%; margin-bottom: 20px;" >
+<br>
 
 {{-- Body --}}
 {{ $slot }}
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css
index bbaa2fbd8ec0a8a2c49207305800e71eb39e3d48..07364aee0f37578d6fddc7dd6cdbd74cd7f6f140 100644 (file)
--- 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 */
Unnamed repository; edit this file 'description' to name the repository.