From dc09d115fb36c9cd3bb60ac66d52cfe170c8731c Mon Sep 17 00:00:00 2001
From: Jeff Ong <jeff.ong@automattic.com>
Date: Thu, 26 Aug 2021 15:49:39 -0400
Subject: [PATCH] Skatepark: remove unneeded CSS for mixed media pattern
 (#4477)

* Remove unneeded margin overrides and make padding consistent.

* Reduce margins for h4 - h6

* JK, leave the heading margins alone.

* Add a spacer.
---
 skatepark/assets/theme.css                                | 5 -----
 skatepark/inc/patterns/mixed-media-in-container.php       | 8 +++++---
 .../sass/block-patterns/_mixed-media-in-container.scss    | 6 ------
 skatepark/sass/theme.scss                                 | 1 -
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 skatepark/sass/block-patterns/_mixed-media-in-container.scss

diff --git a/skatepark/assets/theme.css b/skatepark/assets/theme.css
index eea004ec12..9a1757e788 100644
--- a/skatepark/assets/theme.css
+++ b/skatepark/assets/theme.css
@@ -408,11 +408,6 @@ p {
 	margin-bottom: 0;
 }
 
-.skatepark-mixed-media-in-container hr, .skatepark-mixed-media-in-container p, .skatepark-mixed-media-in-container h1, .skatepark-mixed-media-in-container h2, .skatepark-mixed-media-in-container h3, .skatepark-mixed-media-in-container h4, .skatepark-mixed-media-in-container h5, .skatepark-mixed-media-in-container h6 {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
 .pre-footer h3 {
 	text-transform: uppercase;
 }
diff --git a/skatepark/inc/patterns/mixed-media-in-container.php b/skatepark/inc/patterns/mixed-media-in-container.php
index 5f07ac74d5..2680171ca0 100644
--- a/skatepark/inc/patterns/mixed-media-in-container.php
+++ b/skatepark/inc/patterns/mixed-media-in-container.php
@@ -12,8 +12,8 @@
 	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
 	
-	<!-- wp:group {"align":"wide","style":{"border":{"style":"solid"},"spacing":{"padding":{"top":"3%","right":"4%","bottom":"4%","left":"4%"}}},"className":"skatepark-mixed-media-in-container"} -->
-	<div class="wp-block-group alignwide skatepark-mixed-media-in-container" style="border-style:solid;padding-top:3%;padding-right:4%;padding-bottom:4%;padding-left:4%"><!-- wp:columns {"align":"wide"} -->
+	<!-- wp:group {"align":"wide","style":{"border":{"style":"solid"},"spacing":{"padding":{"top":"4%","right":"4%","bottom":"4%","left":"4%"}}},"className":"skatepark-mixed-media-in-container"} -->
+	<div class="wp-block-group alignwide skatepark-mixed-media-in-container" style="border-style:solid;padding-top:4%;padding-right:4%;padding-bottom:4%;padding-left:4%"><!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.33%"} -->
 	<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:heading {"level":3} -->
 	<h3>' . esc_html__( 'Why Camp?', 'skatepark' ) . '</h3>
@@ -47,7 +47,9 @@
 	
 	<!-- wp:paragraph -->
 	<p>' . esc_html__( 'Skateboarding can teach people discipline, patience, and resiliency. It’s a great sport for kids with a lot of energy! We’ll help build up some structure and support in your life, and you’ll have fun.', 'skatepark' ) . '</p>
-	<!-- /wp:paragraph --></div>
+	<!-- /wp:paragraph --><!-- wp:spacer {"height":40} -->
+	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer --></div>
 	<!-- /wp:column -->
 	
 	<!-- wp:column -->
diff --git a/skatepark/sass/block-patterns/_mixed-media-in-container.scss b/skatepark/sass/block-patterns/_mixed-media-in-container.scss
deleted file mode 100644
index 10d074973d..0000000000
--- a/skatepark/sass/block-patterns/_mixed-media-in-container.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.skatepark-mixed-media-in-container {
-	hr, p, h1, h2, h3, h4, h5, h6 { // Shrink default vertical margins for all the elements in this pattern
-		margin-top: 20px;
-		margin-bottom: 20px;
-	}
-}
\ No newline at end of file
diff --git a/skatepark/sass/theme.scss b/skatepark/sass/theme.scss
index d6a4272760..7e040aa66f 100644
--- a/skatepark/sass/theme.scss
+++ b/skatepark/sass/theme.scss
@@ -13,7 +13,6 @@
 @import "block-styles/indented-paragraph";
 @import "block-styles/side-quote";
 @import "block-styles/testimonial-quote";
-@import "block-patterns/mixed-media-in-container";
 @import "block-patterns/pre-footer";
 @import "block-patterns/paragraph-with-quote";
 @import "elements/headings";