From 42384571e5e530fc0800e7add40163006ddcb89e Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 09:52:14 -0400
Subject: [PATCH 1/9] remove separator hr from footer block

---
 blocks/footer/edit.tsx   | 17 +----------------
 blocks/footer/render.php |  4 ----
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/blocks/footer/edit.tsx b/blocks/footer/edit.tsx
index 65a6af0b..ce0af4a1 100644
--- a/blocks/footer/edit.tsx
+++ b/blocks/footer/edit.tsx
@@ -4,7 +4,6 @@
  * @see https://developer.wordpress.org/block-editor/reference-guides/packages/packages-i18n/
  */
 import { __ } from '@wordpress/i18n';
-import classNames from 'classnames';
 
 /**
  * React hook that is used to mark the block wrapper element.
@@ -19,12 +18,6 @@ import { Spinner } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { useEffect, useState } from '@wordpress/element';
 
-interface EditProps {
-  attributes: {
-    narrow_separator: boolean,
-  };
-}
-
 interface FooterSettings {
   facebook_url: string,
   twitter_url: string,
@@ -42,11 +35,7 @@ interface FooterSettings {
  *
  * @return {WPElement} Element to render.
  */
-export default function Edit({
-  attributes: {
-    narrow_separator: narrowSeparator = false,
-  },
-}: EditProps) {
+export default function Edit() {
   const [isLoading, setIsLoading] = useState(true);
   const [footerSettings, setFooterSettings] = useState<FooterSettings>();
 
@@ -79,10 +68,6 @@ export default function Edit({
 
   return (
     <div {...useBlockProps()}>
-      <hr className={
-        classNames('wp-block-separator', 'has-alpha-channel-opacity', { 'is-style-wide': !narrowSeparator })
-      }
-      />
       {isLoading
         ? (
           /* @ts-ignore */
diff --git a/blocks/footer/render.php b/blocks/footer/render.php
index aa14f89b..aa2806cf 100644
--- a/blocks/footer/render.php
+++ b/blocks/footer/render.php
@@ -18,12 +18,8 @@
 $nb_image_id         = $nb_footer_settings['image'] ?? 0;
 $nb_address          = $nb_footer_settings['address'] ?? '';
 $nb_has_social_links = ! empty( $nb_facebook_url ) || ! empty( $nb_twitter_url ) || ! empty( $nb_instagram_url ) || ! empty( $nb_youtube_url );
-$nb_narrow_separator = ! empty( $attributes['narrow_separator'] );
-$nb_separator_class  = $nb_narrow_separator ? '' : 'is-style-wide';
 ?>
 <div <?php echo wp_kses_data( get_block_wrapper_attributes() ); ?> align="center">
-	<hr class="wp-block-separator has-alpha-channel-opacity <?php echo esc_attr( $nb_separator_class ); ?>" />
-
 	<?php if ( $nb_has_social_links ) : ?>
 		<div class="wp-block-wp-newsletter-builder-footer__social-links">
 			<?php if ( ! empty( $nb_facebook_url ) ) : ?>

From 9c208ea91d450eacabe818c9b8432b168ffeb98d Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:04:57 -0400
Subject: [PATCH 2/9] remove bottom margin from header block

---
 blocks/header/style.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/blocks/header/style.scss b/blocks/header/style.scss
index ba90e412..440382d9 100644
--- a/blocks/header/style.scss
+++ b/blocks/header/style.scss
@@ -12,8 +12,6 @@
  */
 
 .wp-block-wp-newsletter-builder-header {
-  margin-bottom: 20px;
-  margin-top: 6px;
   // @TODO: style alt text.
 
   &__placeholder {

From 66ac070fb2215d26397817e5ee1472b4ff95d6e1 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:10:05 -0400
Subject: [PATCH 3/9] remove margin from headings

---
 blocks/heading/edit.tsx       | 2 +-
 blocks/heading/index.tsx      | 3 +--
 blocks/heading/style.scss     | 5 +++++
 scss/core-blocks/heading.scss | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 blocks/heading/style.scss

diff --git a/blocks/heading/edit.tsx b/blocks/heading/edit.tsx
index 9768b65d..3940531e 100644
--- a/blocks/heading/edit.tsx
+++ b/blocks/heading/edit.tsx
@@ -61,7 +61,7 @@ export default function Edit({
           />
         </PanelBody>
       </InspectorControls>
-      <div {...useBlockProps({ className: 'newsletter-heading', style: headingStyles })}>
+      <div {...useBlockProps({ className: 'wp-block-wp-newsletter-builder-heading', style: headingStyles })}>
         <InnerBlocks
           // @ts-ignore
           template={TEMPLATE}
diff --git a/blocks/heading/index.tsx b/blocks/heading/index.tsx
index 284b92ac..810c8556 100644
--- a/blocks/heading/index.tsx
+++ b/blocks/heading/index.tsx
@@ -13,8 +13,7 @@ import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
  *
  * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
  */
-// Uncomment this line if you want to import a CSS file for this block.
-// import './style.scss';
+import './style.scss';
 
 /**
  * Internal dependencies
diff --git a/blocks/heading/style.scss b/blocks/heading/style.scss
new file mode 100644
index 00000000..06fab406
--- /dev/null
+++ b/blocks/heading/style.scss
@@ -0,0 +1,5 @@
+.wp-block-wp-newsletter-builder-heading {
+  h1, h2, h3, h4, h5, h6 {
+    margin: 0;
+  }
+}
diff --git a/scss/core-blocks/heading.scss b/scss/core-blocks/heading.scss
index 3f830a46..1812497f 100644
--- a/scss/core-blocks/heading.scss
+++ b/scss/core-blocks/heading.scss
@@ -6,6 +6,7 @@ h6 {
   font-family: Georgia, serif;
   font-weight: bold;
   line-height: 1.3;
+  margin: 0;
 
   span {
     font-family: Georgia, serif;

From 2993a458b352a200fd02e34004d496b8f2c9edb0 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:11:37 -0400
Subject: [PATCH 4/9] remove margins from list blocks

---
 blocks/list/edit.tsx       | 2 +-
 blocks/list/index.tsx      | 3 +--
 blocks/list/style.scss     | 5 +++++
 scss/core-blocks/list.scss | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 blocks/list/style.scss

diff --git a/blocks/list/edit.tsx b/blocks/list/edit.tsx
index 6268c885..b2ceeb72 100644
--- a/blocks/list/edit.tsx
+++ b/blocks/list/edit.tsx
@@ -61,7 +61,7 @@ export default function Edit({
           />
         </PanelBody>
       </InspectorControls>
-      <div {...useBlockProps({ className: 'newsletter-list', style: listStyles })}>
+      <div {...useBlockProps({ className: 'wp-block-wp-newsletter-builder-list', style: listStyles })}>
         <InnerBlocks
           // @ts-ignore
           template={TEMPLATE}
diff --git a/blocks/list/index.tsx b/blocks/list/index.tsx
index 284b92ac..810c8556 100644
--- a/blocks/list/index.tsx
+++ b/blocks/list/index.tsx
@@ -13,8 +13,7 @@ import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
  *
  * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
  */
-// Uncomment this line if you want to import a CSS file for this block.
-// import './style.scss';
+import './style.scss';
 
 /**
  * Internal dependencies
diff --git a/blocks/list/style.scss b/blocks/list/style.scss
new file mode 100644
index 00000000..e766592e
--- /dev/null
+++ b/blocks/list/style.scss
@@ -0,0 +1,5 @@
+.wp-block-wp-newsletter-builder-list {
+  ul, ol {
+    margin: 0;
+  }
+}
diff --git a/scss/core-blocks/list.scss b/scss/core-blocks/list.scss
index c370b95c..95f3dab8 100644
--- a/scss/core-blocks/list.scss
+++ b/scss/core-blocks/list.scss
@@ -2,6 +2,7 @@ ul, ol {
   font-family: Georgia, serif;
   font-size: 16px;
   line-height: 1.3;
+  margin: 0;
 
   span {
     font-family: Georgia, serif;

From 9e6ff425a284e43c52cf28263f088d7cad428da2 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:13:05 -0400
Subject: [PATCH 5/9] remove margins from paragraph blocks

---
 blocks/paragraph/edit.tsx       | 2 +-
 blocks/paragraph/index.tsx      | 3 +--
 blocks/paragraph/style.scss     | 5 +++++
 scss/core-blocks/paragraph.scss | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 blocks/paragraph/style.scss

diff --git a/blocks/paragraph/edit.tsx b/blocks/paragraph/edit.tsx
index faea1815..0cc2f28c 100644
--- a/blocks/paragraph/edit.tsx
+++ b/blocks/paragraph/edit.tsx
@@ -61,7 +61,7 @@ export default function Edit({
           />
         </PanelBody>
       </InspectorControls>
-      <div {...useBlockProps({ className: 'newsletter-paragraph', style: paragraphStyles })}>
+      <div {...useBlockProps({ className: 'wp-block-wp-newsletter-builder-paragraph', style: paragraphStyles })}>
         <InnerBlocks
           // @ts-ignore
           template={TEMPLATE}
diff --git a/blocks/paragraph/index.tsx b/blocks/paragraph/index.tsx
index 284b92ac..810c8556 100644
--- a/blocks/paragraph/index.tsx
+++ b/blocks/paragraph/index.tsx
@@ -13,8 +13,7 @@ import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
  *
  * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
  */
-// Uncomment this line if you want to import a CSS file for this block.
-// import './style.scss';
+import './style.scss';
 
 /**
  * Internal dependencies
diff --git a/blocks/paragraph/style.scss b/blocks/paragraph/style.scss
new file mode 100644
index 00000000..5d121401
--- /dev/null
+++ b/blocks/paragraph/style.scss
@@ -0,0 +1,5 @@
+.wp-block-wp-newsletter-builder-paragraph {
+  p {
+    margin: 0;
+  }
+}
diff --git a/scss/core-blocks/paragraph.scss b/scss/core-blocks/paragraph.scss
index b65e713b..268504d9 100644
--- a/scss/core-blocks/paragraph.scss
+++ b/scss/core-blocks/paragraph.scss
@@ -2,6 +2,7 @@ p {
   font-family: Georgia, serif;
   font-size: 16px;
   line-height: 1.33;
+  margin: 0;
 
   span {
     font-family: Georgia, serif;

From 388f5b09b0d8e4a0c843ef7a3a2e518244f397ea Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:13:22 -0400
Subject: [PATCH 6/9] remove margin from image blocks

---
 scss/core-blocks/image.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scss/core-blocks/image.scss b/scss/core-blocks/image.scss
index 4c1be607..bafe73d5 100644
--- a/scss/core-blocks/image.scss
+++ b/scss/core-blocks/image.scss
@@ -1,8 +1,12 @@
 .wp-block-image {
-  margin-bottom: 20px;
+  margin-bottom: 0;
 }
 
 .aligncenter > img {
   margin-left: auto;
   margin-right: auto;
 }
+
+figure {
+  margin: 0;
+}
\ No newline at end of file

From ba18627960e20f866ae41e8c88b313ca0bef4cb4 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:15:06 -0400
Subject: [PATCH 7/9] version bump

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index 347915dc..8a0cb351 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.19
+ * Version: 0.3.20
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

From 8ad5255577108fd39122efe13fec63abe4868e1a Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 11:28:22 -0400
Subject: [PATCH 8/9] lint

---
 scss/core-blocks/image.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scss/core-blocks/image.scss b/scss/core-blocks/image.scss
index bafe73d5..4b1eae5b 100644
--- a/scss/core-blocks/image.scss
+++ b/scss/core-blocks/image.scss
@@ -9,4 +9,4 @@
 
 figure {
   margin: 0;
-}
\ No newline at end of file
+}

From 8106b5f859e09d40f8da037b2d8325373e61b4fc Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Wed, 12 Jun 2024 14:30:24 -0400
Subject: [PATCH 9/9] version bump

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index 8a0cb351..5297e9e2 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.20
+ * Version: 0.3.21
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2