Skip to content
Snippets Groups Projects
Commit 6c29f632 authored by Morris Jobke's avatar Morris Jobke Committed by GitHub
Browse files

Merge pull request #5850 from nextcloud/revert-5783-outlook-max-width 

Revert 5783 outlook max width and add height="120"
parents 5eee110b ae13d011
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/private/Mail/EMailTemplate.php
+ 1
− 4
View file @ 6c29f632
...@@ -100,10 +100,7 @@ EOF; ...@@ -100,10 +100,7 @@ EOF;
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%%"> <center data-parsed="" style="min-width:580px;width:100%%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
......
tests/Settings/Mailer/NewUserMailHelperTest.php
+ 2
− 8
View file @ 6c29f632
...@@ -182,10 +182,7 @@ class NewUserMailHelperTest extends TestCase { ...@@ -182,10 +182,7 @@ class NewUserMailHelperTest extends TestCase {
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%"> <center data-parsed="" style="min-width:580px;width:100%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
...@@ -418,10 +415,7 @@ EOF; ...@@ -418,10 +415,7 @@ EOF;
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%"> <center data-parsed="" style="min-width:580px;width:100%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
......
tests/data/emails/new-account-email-custom.html
+ 1
− 4
View file @ 6c29f632
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%"> <center data-parsed="" style="min-width:580px;width:100%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
......
tests/data/emails/new-account-email-single-button.html
+ 1
− 4
View file @ 6c29f632
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%"> <center data-parsed="" style="min-width:580px;width:100%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
......
tests/data/emails/new-account-email.html
+ 1
− 4
View file @ 6c29f632
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<tbody> <tbody>
<tr style="padding:0;text-align:left;vertical-align:top"> <tr style="padding:0;text-align:left;vertical-align:top">
<center data-parsed="" style="min-width:580px;width:100%"> <center data-parsed="" style="min-width:580px;width:100%">
<!-- convince Outlook to have a max-width of 100px --> <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">
<!--[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> </center>
</tr> </tr>
</tbody> </tbody>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment