Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a65fa0e4 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'dev/mail-dark-theme-fix' into 'main' 

button and log fixes on dark theme

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!19
parents 2deabd5f 0f45be18

lib/Mail/EMailTemplate.php

+9 −8
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ class EMailTemplate extends ParentTemplate { 
<tbody>

<tr style="padding:0;text-align:left;vertical-align:top">

    <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

        <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:left;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;padding-top:9px;margin-left:10px;">

        <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:left;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;padding-top:4px;margin-left:10px;">

EOF;



protected $heading = <<<EOF

<h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-family:arial;font-size:24px;font-weight:bold;color:#000000;line-height:1.3;margin:0;padding:0;text-align:center;word-wrap:normal;padding-right:105px;">%s</h1>

<h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-family:arial;font-size:24px;font-weight:400;color:#000000;line-height:1.3;margin:0;padding:0;text-align:center;word-wrap:normal;padding-right:105px;">%s</h1>

    </td>

</tr>

</tbody>
@@ -81,8 +81,8 @@ protected $buttonGrouptentative = <<<EOF 
									<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

										<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">

											<tr style="padding:0;text-align:left;vertical-align:top">

												<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;background:#f8f8f8;border:0 solid #f8f8f8;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

													<a href="%10\$s" style="Margin:0;background-color:#f8f8f8;border:0 solid #f8f8f8;border-radius:2px;color:#000000!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;outline:1px solid #CBCBCB;padding:10px 25px 10px 25px;text-align:left;text-decoration:none">%11\$s</a>

												<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;background:#ffffff;border:0 solid #0086FF;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

													<a href="%10\$s" style="Margin:0;background-color:#ffffff;border:0 solid #0086FF;border-radius:2px;color:#0086FF!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;outline:1px solid #0086FF;padding:10px 25px 10px 25px;text-align:left;text-decoration:none">%11\$s</a>

												</td>

											</tr>

										</table>
@@ -94,8 +94,8 @@ protected $buttonGrouptentative = <<<EOF 
									<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

										<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">

											<tr style="padding:0;text-align:left;vertical-align:top">

												<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;background:#6C757D;border:0 solid #6C757D;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

													<a href="%8\$s" style="Margin:0;background-color:#6C757D;border:0 solid #6C757D;border-radius:2px;color:#ffffff!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;outline:1px solid #CBCBCB;padding:10px 25px 10px 25px;text-align:left;text-decoration:none">%9\$s</a>

												<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;background:#ffffff;border:0 solid #0086FF;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

													<a href="%8\$s" style="Margin:0;background-color:#ffffff;border:0 solid #6C757D;border-radius:2px;color:#0086FF!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;outline:1px solid #0086FF;padding:10px 25px 10px 25px;text-align:left;text-decoration:none">%9\$s</a>

												</td>

											</tr>

										</table>
@@ -122,7 +122,8 @@ EOF; 
		$this->headerAdded = true;



		$logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo(false));

		$this->htmlBody .= vsprintf($this->header, [$logoUrl, $this->themingDefaults->getName()]);

		$logoMailUrl = str_replace('logo.png','logomail.png',$logoUrl);

		$this->htmlBody .= vsprintf($this->header, [$logoMailUrl, $this->themingDefaults->getName()]);

	}
@@ -155,7 +156,7 @@ EOF; 


		$htmlText = $text;

		if ($metaInfo) {

			$htmlText = '<span style="color:#777;font-weight:bold;">' . $metaInfo . ' </span>  '. $htmlText;

			$htmlText = '<span style="color:#777;font-weight:700;">' . $metaInfo . ' </span>  '. $htmlText;

		}

		if ($icon !== '') {

			$icon = '<img style="padding-top: 3px;" src="' . htmlspecialchars($icon) . '" alt="&bull;">';