<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11785] trunk/src/bp-templates: Emails: merge in updates from upstream template.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11785">11785</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11785","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-02 17:12:20 +0000 (Tue, 02 Jan 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Emails: merge in updates from upstream template.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7650">#7650</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressassetsemailssinglebpemailphp">trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressassetsemailssinglebpemailphp">trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbplegacybuddypressassetsemailssinglebpemailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php 2018-01-02 16:28:59 UTC (rev 11784)
+++ trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php 2018-01-02 17:12:20 UTC (rev 11785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> The MIT License (MIT)
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Copyright (c) 2013 Ted Goas
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Copyright (c) 2017 Ted Goas
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Permission is hereby granted, free of charge, to any person obtaining a copy of
</span><span class="cx" style="display: block; padding: 0 10px"> this software and associated documentation files (the "Software"), to deal in
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,12 +44,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = bp_email_get_appearance_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?><!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
</ins><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
+ <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- CSS Reset -->
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,11 +71,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-text-size-adjust: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: Forces Outlook.com to display emails full width. */
- .ExternalClass {
- width: 100%;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* What is does: Centers email on Android 4.4 */
</span><span class="cx" style="display: block; padding: 0 10px"> div[style*="margin: 16px 0"] {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 !important;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,22 +102,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: Overrides styles added when Yahoo's auto-senses a link. */
- .yshortcuts a {
- border-bottom: none !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* What it does: A work-around for email clients meddling in triggered links. */
+ *[x-apple-data-detectors], /* iOS */
+ .x-gmail-data-detectors, /* Gmail */
+ .x-gmail-data-detectors *,
+ .aBn {
+ border-bottom: 0 !important;
+ cursor: default !important;
+ color: inherit !important;
+ text-decoration: none !important;
+ font-size: inherit !important;
+ font-family: inherit !important;
+ font-weight: inherit !important;
+ line-height: inherit !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: A work-around for iOS meddling in triggered links. */
- a[x-apple-data-detectors] {
- color: inherit !important;
- text-decoration: underline !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* What it does: Prevents Gmail from displaying an download button on large, non-linked images. */
+ .a6S {
+ display: none !important;
+ opacity: 0.01 !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* If the above doesn't work, add a .g-img class to any image in question. */
+ img.g-img + div {
+ display: none !important;
+ }
+
+ /* What it does: Prevents underlining the button text in Windows 10 */
+ .button-link {
+ text-decoration: none !important;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<body class="email_bg" width="100%" height="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="Margin: 0;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<body class="email_bg" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="margin: 0; mso-line-height-rule: exactly;">
</ins><span class="cx" style="display: block; padding: 0 10px"> <table cellpadding="0" cellspacing="0" border="0" height="100%" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="border-collapse:collapse;" class="email_bg"><tr><td valign="top">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <center style="width: 100%;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <center style="width: 100%; text-align: left;">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Visually Hidden Preheader Text : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div style="display: none; font-size: 1px; line-height: 1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,15 +145,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Visually Hidden Preheader Text : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div style="max-width: 600px;">
- <!--[if (gte mso 9)|(IE)]>
- <table cellspacing="0" cellpadding="0" border="0" width="600" align="center">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div style="max-width: 600px; margin: auto;" class="email-container">
+ <!--[if mso]>
+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="600" align="center">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <![endif]-->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Header : BEGIN -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,12 +179,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Header : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Body : BEGIN -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- 1 Column Text : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" width="100%">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Footer : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <br>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="left" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="left" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: left; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Footer : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!--[if (gte mso 9)|(IE)]>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!--[if mso]>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressassetsemailssinglebpemailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php 2018-01-02 16:28:59 UTC (rev 11784)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php 2018-01-02 17:12:20 UTC (rev 11785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> The MIT License (MIT)
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Copyright (c) 2013 Ted Goas
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Copyright (c) 2017 Ted Goas
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Permission is hereby granted, free of charge, to any person obtaining a copy of
</span><span class="cx" style="display: block; padding: 0 10px"> this software and associated documentation files (the "Software"), to deal in
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,12 +44,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = bp_email_get_appearance_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?><!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
</ins><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
+ <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- CSS Reset -->
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,11 +71,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-text-size-adjust: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: Forces Outlook.com to display emails full width. */
- .ExternalClass {
- width: 100%;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* What is does: Centers email on Android 4.4 */
</span><span class="cx" style="display: block; padding: 0 10px"> div[style*="margin: 16px 0"] {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 !important;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,22 +102,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: Overrides styles added when Yahoo's auto-senses a link. */
- .yshortcuts a {
- border-bottom: none !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* What it does: A work-around for email clients meddling in triggered links. */
+ *[x-apple-data-detectors], /* iOS */
+ .x-gmail-data-detectors, /* Gmail */
+ .x-gmail-data-detectors *,
+ .aBn {
+ border-bottom: 0 !important;
+ cursor: default !important;
+ color: inherit !important;
+ text-decoration: none !important;
+ font-size: inherit !important;
+ font-family: inherit !important;
+ font-weight: inherit !important;
+ line-height: inherit !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* What it does: A work-around for iOS meddling in triggered links. */
- a[x-apple-data-detectors] {
- color: inherit !important;
- text-decoration: underline !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* What it does: Prevents Gmail from displaying an download button on large, non-linked images. */
+ .a6S {
+ display: none !important;
+ opacity: 0.01 !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* If the above doesn't work, add a .g-img class to any image in question. */
+ img.g-img + div {
+ display: none !important;
+ }
+
+ /* What it does: Prevents underlining the button text in Windows 10 */
+ .button-link {
+ text-decoration: none !important;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<body class="email_bg" width="100%" height="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="Margin: 0;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<body class="email_bg" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="margin: 0; mso-line-height-rule: exactly;">
</ins><span class="cx" style="display: block; padding: 0 10px"> <table cellpadding="0" cellspacing="0" border="0" height="100%" width="100%" bgcolor="<?php echo esc_attr( $settings['email_bg'] ); ?>" style="border-collapse:collapse;" class="email_bg"><tr><td valign="top">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <center style="width: 100%;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <center style="width: 100%; text-align: left;">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Visually Hidden Preheader Text : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div style="display: none; font-size: 1px; line-height: 1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,15 +145,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Visually Hidden Preheader Text : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div style="max-width: 600px;">
- <!--[if (gte mso 9)|(IE)]>
- <table cellspacing="0" cellpadding="0" border="0" width="600" align="center">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div style="max-width: 600px; margin: auto;" class="email-container">
+ <!--[if mso]>
+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="600" align="center">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <![endif]-->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Header : BEGIN -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" bgcolor="<?php echo esc_attr( $settings['header_bg'] ); ?>" class="header_bg">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,12 +179,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Header : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Body : BEGIN -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" bgcolor="<?php echo esc_attr( $settings['body_bg'] ); ?>" width="100%" style="max-width: 600px; border-radius: 5px;" class="body_bg">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- 1 Column Text : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" width="100%">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Footer : BEGIN -->
</span><span class="cx" style="display: block; padding: 0 10px"> <br>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table cellspacing="0" cellpadding="0" border="0" align="left" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="left" width="100%" style="max-width: 600px; border-radius: 5px;" bgcolor="<?php echo esc_attr( $settings['footer_bg'] ); ?>" class="footer_bg">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: left; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Email Footer : END -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!--[if (gte mso 9)|(IE)]>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!--[if mso]>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>