Skip to content

Commit

Permalink
Merge pull request mautic#2474 from escopecz/oxygen-attributes-fix
Browse files Browse the repository at this point in the history 
HTML attributes in the Oxygen theme caused JS error - fix
  • Loading branch information
@dongilbert
dongilbert authored Sep 28, 2016
2 parents 2cb69b6 + ed6a9bc commit a75c6af
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 32 deletions.
37 changes: 19 additions & 18 deletions themes/oxygen/html/email.html.twig
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<title>{subject}</title>
</head>
<body style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;-webkit-font-smoothing: antialiased;-webkit-text-size-adjust: none;height: 100%;color: #676767;width: 100% !important;margin: 0 !important;">
<div data-section-wrapper align="center" valign="top" width="100%" style="background-color: #f7f7f7;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 20px 0 30px;" class="content-padding">
<body style="font-family: Helvetica, Arial, sans-serif;color: #676767;width: 100%;margin: 0;">
<div data-section-wrapper style="width:100%;background-color: #f7f7f7;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;padding: 20px 0 30px;" class="content-padding">
<center>
<table data-section cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important;">
<table data-section cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse;">
<tr>
<td class="header-lg" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 32px;color: #4d4d4d;text-align: center;line-height: normal;border-collapse: collapse;font-weight: 700;padding: 35px 0 0;">
<div data-slot="text">
Expand All @@ -14,22 +15,22 @@
</td>
</tr>
<tr>
<td class="free-text" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 10px 60px 0px;width: 100% !important;">
<td class="free-text" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 10px 60px 0px 60px;width: 100%;">
<div data-slot="text">
<span><a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none !important;">@JaneDoe</a></span> has invited you to join Awesome inc!
<span><a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none;">@JaneDoe</a></span> has invited you to join Awesome inc!
</div>
</td>
</tr>
<tr>
<td class="mini-block-container" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 30px 50px;width: 500px;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate !important;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate;">
<tr>
<td class="mini-block" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;background-color: #ffffff;width: 498px;border: 1px solid #cccccc;border-radius: 5px;padding: 45px 75px;">
<div class="user-img" data-slot="text" style="text-align: center;border-radius: 100px;color: #ff6f6f;font-weight: 700;">
<a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none !important;"><img class="user-img" src="{{ getAssetUrl('themes/'~template~'/img/profile_pic.jpg', null, null, true) }}" alt="user img" style="max-width: 600px;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;border: 1px solid #cccccc;text-align: center;border-radius: 5px;color: #ff6f6f;font-weight: 700;width: 130px;"></a>
<br><a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none !important;">@JaneDoe</a>
<a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none;"><img class="user-img" src="{{ getAssetUrl('themes/'~template~'/img/profile_pic.jpg', null, null, true) }}" alt="user img" style="max-width: 600px;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;border: 1px solid #cccccc;text-align: center;border-radius: 5px;color: #ff6f6f;font-weight: 700;width: 130px;"></a>
<br><a href="" style="color: #ff6f6f;font-weight: bold;text-decoration: none;">@JaneDoe</a>
</div>
<div class="user-msg" data-slot="text" style="padding: 10px 0;font-size: 14px;text-align: center;font-style: italic;">
<div class="user-msg" data-slot="text" style="padding: 10px 0px;font-size: 14px;text-align: center;font-style: italic;">
"Hey Bob,
here's your invite! Come check out my profile page when you have a chance. You'll love it!"
</div>
Expand All @@ -47,23 +48,23 @@
</table>
</center>
</div>
<div data-section-wrapper align="center" valign="top" width="100%" style="background-color: #ffffff;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;">
<div data-section-wrapper style="width:100%; background-color: #ffffff;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;">
<center>
<table data-section cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important;">
<table data-section cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse;">
<tr>
<td class="header-md" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 24px;color: #4d4d4d;text-align: center;line-height: normal;border-collapse: collapse;font-weight: 700;padding: 35px 0 0;">
<td class="header-md" data-slot-container style="font-family: Helvetica, Arial, sans-serif;font-size: 24px;color: #4d4d4d;text-align: center;line-height: normal;border-collapse: collapse;font-weight: 700;padding: 35px 0px 0px 0px;">
<div data-slot="text">
Come check us out!
</div>
</td>
</tr>
<tr>
<td class="mini-imgs" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 25px 0 30px;" data-slot-container>
<td class="mini-imgs" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 25px 0px 30px 0px;" data-slot-container>
<div data-slot="text">
<table cellpadding="0" cellspacing="0" width="0" style="border-collapse:separate !important;">
<table cellpadding="0" cellspacing="0" width="0" style="border-collapse:separate;">
<tr>
<td class="mobile-block" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate !important;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate;">
<tr>
<td class="mini-img" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 3px;width: 130px;">
<img src="{{ getAssetUrl('themes/'~template~'/img/bracelet.jpg', null, null, true) }}" alt="product" style="max-width: 600px;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;border-radius: 3px;width: 130px;">
Expand All @@ -83,7 +84,7 @@
</table>
</td>
<td class="mobile-block" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate !important;">
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate;">
<tr>
<td class="mini-img" style="font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;padding: 3px;width: 130px;">
<img src="{{ getAssetUrl('themes/'~template~'/img/shoes.jpg', null, null, true) }}" alt="product" style="max-width: 600px;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;border-radius: 3px;width: 130px;">
Expand All @@ -110,9 +111,9 @@
</table>
</center>
</div>
<div data-section-wrapper align="center" valign="top" width="100%" style="background-color: #f7f7f7;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;">
<div data-section-wrapper style="width:100%; background-color: #f7f7f7;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;">
<center>
<table data-section cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important;">
<table data-section cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse;">
<tr>
<td style="padding: 25px 0 25px;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;border-collapse: collapse;" data-slot-container>
<div data-slot="text">
Expand Down
Loading

0 comments on commit a75c6af

Please sign in to comment.