From 46eeab50a68843910fc0952f0f6c94521f22324d Mon Sep 17 00:00:00 2001
From: Miguel Peixe <miguel@peixe.co>
Date: Wed, 6 Jul 2022 13:43:37 -0300
Subject: [PATCH] fix: forwarded newsletter css

---
 includes/email-template.mjml.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/includes/email-template.mjml.php b/includes/email-template.mjml.php
index 12bc53979..d841a1875 100644
--- a/includes/email-template.mjml.php
+++ b/includes/email-template.mjml.php
@@ -10,20 +10,24 @@
 
 <mjml>
 	<mj-head>
-		<mj-title><?php echo $title; ?></mj-title>
-		<mj-style>
-		<?php
-			$default_css = file_get_contents( dirname( __FILE__ ) . '/email-template-mjml.css' );
-			$css         = $default_css . "\n" . $custom_css;
-
-			echo esc_html( $css );
-			echo Newspack_Newsletters_Editor::get_color_palette_css();
-			do_action( 'newspack_newsletters_editor_mjml_head' );
-		?>
+		<?php if ( isset( $title ) && ! empty( $title ) ) : ?>
+			<mj-title><?php echo $title; ?></mj-title>
+		<?php endif; ?>
+		<mj-style inline="inline">
+			<?php echo esc_html( file_get_contents( dirname( __FILE__ ) . '/email-template-mjml.css' ) ); ?>
+		</mj-style>
+		<?php if ( isset( $custom_css ) && ! empty ( $custom_css ) ) : ?>
+			<mj-style inline="inline">
+				<?php echo esc_html( $custom_css ); ?>
+			</mj-style>
+		<?php endif; ?>
+		<mj-style inline="inline">
+			<?php echo esc_html( Newspack_Newsletters_Editor::get_color_palette_css() ); ?>
 		</mj-style>
 		<?php if ( isset( $preview_text ) ): ?>
 			<mj-preview><?php echo $preview_text; ?></mj-preview>
 		<?php endif; ?>
+		<?php do_action( 'newspack_newsletters_editor_mjml_head' ); ?>
 	</mj-head>
 	<mj-body background-color="<?php echo $background_color; ?>">
 		<?php echo $body; ?>