diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-24 10:14:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-24 10:14:47 +0200 |
commit | ba1e16ea2e4585dfb0aaab625b317883ed74ed77 (patch) | |
tree | 896f649fd3cf3fde8384f8965a17cfd5eb398b18 | |
parent | 989614f9d5faa11157b232785537eb5cca927649 (diff) | |
download | nextcloud-server-ba1e16ea2e4585dfb0aaab625b317883ed74ed77.tar.gz nextcloud-server-ba1e16ea2e4585dfb0aaab625b317883ed74ed77.zip |
Revert "Set max-width of image to 100px in Outlook as well"
-rw-r--r-- | lib/private/Mail/EMailTemplate.php | 3 | ||||
-rw-r--r-- | tests/Settings/Mailer/NewUserMailHelperTest.php | 6 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-custom.html | 3 | ||||
-rw-r--r-- | tests/data/emails/new-account-email-single-button.html | 3 | ||||
-rw-r--r-- | tests/data/emails/new-account-email.html | 3 |
5 files changed, 0 insertions, 18 deletions
diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index f924f233f14..0ae79345e4c 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -100,10 +100,7 @@ EOF; <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index cee3b15b946..a8b67278e77 100644 --- a/tests/Settings/Mailer/NewUserMailHelperTest.php +++ b/tests/Settings/Mailer/NewUserMailHelperTest.php @@ -182,10 +182,7 @@ class NewUserMailHelperTest extends TestCase { <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> @@ -418,10 +415,7 @@ EOF; <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html index 4dd95db0510..a60902ae306 100644 --- a/tests/data/emails/new-account-email-custom.html +++ b/tests/data/emails/new-account-email-custom.html @@ -23,10 +23,7 @@ <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index 128f4f30db7..50763efa5b5 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 @@ <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 273e722e052..32568e11b66 100644 --- a/tests/data/emails/new-account-email.html +++ b/tests/data/emails/new-account-email.html @@ -23,10 +23,7 @@ <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="min-width:580px;width:100%"> - <!-- convince Outlook to have a max-width of 100px --> - <!--[if mso]><table><tr><td width="100"><![endif]--> <img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto"> - <!--[if mso]></td></tr></table><![endif]--> </center> </tr> </tbody> |