From ba1e16ea2e4585dfb0aaab625b317883ed74ed77 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 24 Jul 2017 10:14:47 +0200 Subject: [PATCH 1/3] Revert "Set max-width of image to 100px in Outlook as well" --- lib/private/Mail/EMailTemplate.php | 3 --- tests/Settings/Mailer/NewUserMailHelperTest.php | 6 ------ tests/data/emails/new-account-email-custom.html | 3 --- tests/data/emails/new-account-email-single-button.html | 3 --- tests/data/emails/new-account-email.html | 3 --- 5 files changed, 18 deletions(-) diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index f924f233f1..0ae79345e4 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -100,10 +100,7 @@ EOF;
- - -
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index cee3b15b94..a8b67278e7 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -182,10 +182,7 @@ class NewUserMailHelperTest extends TestCase {
- - -
@@ -418,10 +415,7 @@ EOF;
- - -
diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index 4dd95db051..a60902ae30 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -23,10 +23,7 @@
- - -
diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index 128f4f30db..50763efa5b 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -23,10 +23,7 @@
- - -
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 273e722e05..32568e11b6 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -23,10 +23,7 @@
- - -
From bb6fe6afba74139a4aed3951acdff4c73ed7f60b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 24 Jul 2017 10:17:12 +0200 Subject: [PATCH 2/3] Adjust to height=120 Signed-off-by: Lukas Reschke --- lib/private/Mail/EMailTemplate.php | 2 +- tests/Settings/Mailer/NewUserMailHelperTest.php | 4 ++-- tests/data/emails/new-account-email-custom.html | 2 +- tests/data/emails/new-account-email-single-button.html | 2 +- tests/data/emails/new-account-email.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 0ae79345e4..dd8bdbd8ec 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -100,7 +100,7 @@ EOF;
- +
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index a8b67278e7..b0ee6a9bef 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -182,7 +182,7 @@ class NewUserMailHelperTest extends TestCase {
- +
@@ -415,7 +415,7 @@ EOF;
- +
diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index a60902ae30..4bf360b200 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -23,7 +23,7 @@
- +
diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index 50763efa5b..901fdbca69 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -23,7 +23,7 @@
- +
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 32568e11b6..c1e56954cf 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -23,7 +23,7 @@
- +
From ae13d011d1ede47d65c4017f05dbec219947b64f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 24 Jul 2017 11:09:14 +0200 Subject: [PATCH 3/3] Remove unneeded styles Signed-off-by: Morris Jobke --- lib/private/Mail/EMailTemplate.php | 2 +- tests/Settings/Mailer/NewUserMailHelperTest.php | 4 ++-- tests/data/emails/new-account-email-custom.html | 2 +- tests/data/emails/new-account-email-single-button.html | 2 +- tests/data/emails/new-account-email.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index dd8bdbd8ec..8227e69ef0 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -100,7 +100,7 @@ EOF;
- +
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index b0ee6a9bef..40ba9ee1c2 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -182,7 +182,7 @@ class NewUserMailHelperTest extends TestCase {
- +
@@ -415,7 +415,7 @@ EOF;
- +
diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index 4bf360b200..e35b9f5784 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -23,7 +23,7 @@
- +
diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index 901fdbca69..d70a8a647d 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -23,7 +23,7 @@
- +
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index c1e56954cf..3e8814bbfb 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -23,7 +23,7 @@
- +