From 409e48c6fbf75dcaf3107dd1abd847cbebbf412a Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 24 Jun 2019 14:55:41 +0100
Subject: [PATCH] Use white backgrounds

---
 packages/block-editor/src/components/inner-blocks/style.scss  | 4 ++++
 packages/block-library/src/columns/deprecated.js              | 2 +-
 .../e2e-tests/fixtures/blocks/core__columns__deprecated.json  | 4 +---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/inner-blocks/style.scss b/packages/block-editor/src/components/inner-blocks/style.scss
index 6851d77b44acda..71e934350e541b 100644
--- a/packages/block-editor/src/components/inner-blocks/style.scss
+++ b/packages/block-editor/src/components/inner-blocks/style.scss
@@ -60,6 +60,10 @@
 		// Override default styles inherited from <IconButton /> to center
 		// icon horizontally.
 		justify-content: center;
+
+		&.is-default {
+			background-color: $white;
+		}
 	}
 
 	&.components-button {
diff --git a/packages/block-library/src/columns/deprecated.js b/packages/block-library/src/columns/deprecated.js
index 3e6d23cb73f3c2..56ffe5d90bc6a1 100644
--- a/packages/block-library/src/columns/deprecated.js
+++ b/packages/block-library/src/columns/deprecated.js
@@ -88,7 +88,7 @@ export default [
 			) );
 
 			return [
-				attributes,
+				omit( attributes, [ 'columns' ] ),
 				migratedInnerBlocks,
 			];
 		},
diff --git a/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.json b/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.json
index 6993fb5da69c4a..c5ad0b8151b8e3 100644
--- a/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.json
+++ b/packages/e2e-tests/fixtures/blocks/core__columns__deprecated.json
@@ -3,9 +3,7 @@
         "clientId": "_clientId_0",
         "name": "core/columns",
         "isValid": true,
-        "attributes": {
-            "columns": 3
-        },
+        "attributes": {},
         "innerBlocks": [
             {
                 "clientId": "_clientId_0",