From 1d5e7b3ceeaeed2bd49e6d67bcbb768abc9cae90 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2020 10:33:23 +0200 Subject: Fix notification mails height issue in Nextcloud Mail Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 9148995aaa0..edb6965f889 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -88,7 +88,7 @@ class EMailTemplate implements IEMailTemplate { - +
-- cgit v1.2.3 From 43371c9f7ca9ad4dcf4ecdde61a30414748214ec Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2020 10:55:10 +0200 Subject: Notification mails: Adjust vertical spacing Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index edb6965f889..758a5e57ab8 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -132,7 +132,7 @@ EOF; - +
  
@@ -165,13 +165,6 @@ EOF;
- - - - - - -
 
EOF; protected $bodyText = << Date: Thu, 9 Apr 2020 10:55:43 +0200 Subject: Notification mails: Logo bar/box to circle so it stands nicely on its own Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 758a5e57ab8..38e741f0713 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -78,14 +78,14 @@ class EMailTemplate implements IEMailTemplate { protected $head = << - + - + - + @@ -106,17 +106,17 @@ EOF; EOF; protected $header = << +
- +
-
+
-- cgit v1.2.3 From fbef2708d0b8dbce3e764f88c790e0259d4178ab Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2020 11:32:02 +0200 Subject: Notification mails: Change font to native font stack Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 38e741f0713..247cac4a739 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -85,12 +85,12 @@ class EMailTemplate implements IEMailTemplate { - + -
+
- -
+
EOF; @@ -108,11 +108,11 @@ EOF; protected $header = <<
+ - -
+ @@ -132,7 +132,7 @@ EOF;
- +
  
@@ -142,8 +142,8 @@ EOF; - @@ -151,7 +151,7 @@ EOF;
-

%s

+ 		+

%s
- +
  
@@ -160,24 +160,24 @@ EOF; protected $bodyBegin = <<
+ - - @@ -191,19 +191,19 @@ EOF;
+ EOF; protected $bodyText = <<
+ - - +
-

%s

+ 		+

%s
-
+ EOF; protected $listItem = << - - - + EOF; @@ -219,25 +219,25 @@ EOF;
-

%s

+ 		+

%s

 -

%s

+ 		+

%s
- +
  
- @@ -272,25 +272,25 @@ EOF;
+ - - +
+
-
+ -
- %7\$s + + %7\$s
@@ -246,11 +246,11 @@ EOF;
-
+ -
- %9\$s + + %9\$s
@@ -259,7 +259,7 @@ EOF;
- +
  
- @@ -323,22 +323,22 @@ EOF;
+ - - +
+
-
+ -
- %7\$s + + %7\$s
@@ -299,7 +299,7 @@ EOF;
- +
  
- -- cgit v1.2.3 From d582315c101c8ca0c959262a79ac177f25f702ed Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2020 11:39:25 +0200 Subject: Notification mails: Fix some alignment details and remove shadow Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 247cac4a739..e4c6e2ef1a1 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -143,7 +143,7 @@ EOF; @@ -151,7 +151,7 @@ EOF;
+
- +
  
-

%s

+

%s
-

%s

+

%s
- +
  
@@ -161,7 +161,7 @@ EOF;
- +
@@ -175,7 +175,7 @@ EOF; -- cgit v1.2.3 From e981669e89206c4eefacc27e88cb5b43ce3d4a12 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 30 Apr 2020 11:16:40 +0200 Subject: Fix notification mail tests Signed-off-by: Jan-Christoph Borchardt --- lib/private/Mail/EMailTemplate.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index e4c6e2ef1a1..e91c1208cc6 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -85,7 +85,7 @@ class EMailTemplate implements IEMailTemplate { - +
-

%s

+

%s
@@ -103,6 +103,7 @@ EOF;
                                                           
+ EOF; protected $header = <<