diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-24 13:42:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 13:42:39 +0200 |
| commit | 6c29f632614ff03f2eeb6a187066e9158fbfed19 (patch) | |
| tree | f55db5d7cc41ded9f0157311557efbff5437c82e | |
| parent | 5eee110b15169240134fc54672fe38da63bc7fb1 (diff) | |
| parent | ae13d011d1ede47d65c4017f05dbec219947b64f (diff) | |
| download | nextcloud-server-6c29f632614ff03f2eeb6a187066e9158fbfed19.tar.gz nextcloud-server-6c29f632614ff03f2eeb6a187066e9158fbfed19.zip | |
Merge pull request #5850 from nextcloud/revert-5783-outlook-max-width
Revert 5783 outlook max width and add height="120"
| -rw-r--r-- | lib/private/Mail/EMailTemplate.php | 5 | ||||
| -rw-r--r-- | tests/Settings/Mailer/NewUserMailHelperTest.php | 10 | ||||
| -rw-r--r-- | tests/data/emails/new-account-email-custom.html | 5 | ||||
| -rw-r--r-- | tests/data/emails/new-account-email-single-button.html | 5 | ||||
| -rw-r--r-- | tests/data/emails/new-account-email.html | 5 |
5 files changed, 6 insertions, 24 deletions
diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index f924f233f14..8227e69ef06 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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </center> </tr> </tbody> diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php index cee3b15b946..40ba9ee1c21 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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </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..e35b9f57848 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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </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..d70a8a647d3 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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </center> </tr> </tbody> diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html index 273e722e052..3e8814bbfbb 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]--> + <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;outline:0;text-align:center;text-decoration:none" height="50"> </center> </tr> </tbody> |