Merge updates in trunk

MAILPOET-5643

mailpoet/lib/EmailEditor/Engine/Renderer/styles.css

@@ -124,21 +124,6 @@ p {
   margin: 0;
 }
 
-/* Resetting default browser margins to ensuring the same look in browser, email client and email editor */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0;
-}
-
-ul,
-ol,
-li {
-  margin: 0;
-}
 /* Wa want ensure the same design for all email clients */
 ul,
 ol {

mailpoet/lib/EmailEditor/Integrations/Core/Renderer/Blocks/Heading.php

@@ -8,13 +8,13 @@ use MailPoet\EmailEditor\Engine\SettingsController;
 class Heading implements BlockRenderer {
   public function render($blockContent, array $parsedBlock, SettingsController $settingsController): string {
     $contentStyles = $settingsController->getEmailContentStyles();
-    return str_replace('{heading_content}', $blockContent, $this->prepareColumnTemplate($parsedBlock, $contentStyles));
+    return str_replace('{heading_content}', $blockContent, $this->getBlockWrapper($parsedBlock, $contentStyles));
   }
 
   /**
    * Based on MJML <mj-text>
    */
-  private function prepareColumnTemplate(array $parsedBlock, array $contentStyles): string {
+  private function getBlockWrapper(array $parsedBlock, array $contentStyles): string {
     $styles = [];
     foreach ($parsedBlock['email_attrs'] ?? [] as $property => $value) {
       $styles[$property] = $value;
@@ -28,9 +28,19 @@ class Heading implements BlockRenderer {
     }
 
     return '
-      <div style="' . $this->convertStylesToString($styles) . '">
-        {heading_content}
-      </div>
+      <table
+        role="presentation"
+        border="0"
+        cellpadding="0"
+        cellspacing="0"
+        style="' . $this->convertStylesToString($styles) . '"
+      >
+        <tr>
+          <td>
+            {heading_content}
+          </td>
+        </tr>
+      </table>
     ';
   }