From 3772b9cc577048959ee033c2e4b41de51cea75f0 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 25 Mar 2019 10:25:56 +0000
Subject: [PATCH 1/2] Removes unwanted theme specific Column bottom margin

Restores margin to original spacing value. Removes unwanted additional margin on last child.
---
 packages/block-library/src/columns/style.scss | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/block-library/src/columns/style.scss b/packages/block-library/src/columns/style.scss
index e377480792af02..16ce37b3583d94 100644
--- a/packages/block-library/src/columns/style.scss
+++ b/packages/block-library/src/columns/style.scss
@@ -10,6 +10,8 @@
 }
 
 .wp-block-column {
+	margin-bottom: 1em;
+
 	flex-grow: 1;
 
 	// Responsiveness: Show at most one columns on mobile.
@@ -44,14 +46,6 @@
 	}
 }
 
-// Specificity overide to ensure margin is applied
-// and preserved on last child to ensure that when columns
-// are aligned to bottom they are are flush with each other
-.wp-block-column,
-.entry-content > .wp-block-columns .wp-block-column:last-child {
-	margin-bottom: 1em;
-}
-
 /**
  * All Columns Alignment
  */

From 64bd7f0286f98bc88ea5b88a5c6e9930e20ac074 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 29 Mar 2019 09:37:27 +0000
Subject: [PATCH 2/2] Removes unwanted whitespace in CSS

Addresses https://github.com/WordPress/gutenberg/pull/14614#discussion_r270152542
---
 packages/block-library/src/columns/style.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-library/src/columns/style.scss b/packages/block-library/src/columns/style.scss
index 16ce37b3583d94..2cc0cf0ec4999e 100644
--- a/packages/block-library/src/columns/style.scss
+++ b/packages/block-library/src/columns/style.scss
@@ -11,7 +11,6 @@
 
 .wp-block-column {
 	margin-bottom: 1em;
-
 	flex-grow: 1;
 
 	// Responsiveness: Show at most one columns on mobile.