From f4940400a43612cf8e4e3dcb8710e4789fb856a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <andres.maneiro@automattic.com>
Date: Tue, 9 Jun 2020 13:10:59 +0200
Subject: [PATCH 1/3] Add padding presets

---
 lib/experimental-default-theme.json | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/lib/experimental-default-theme.json b/lib/experimental-default-theme.json
index 1d1cfdabce390..a62614d2f08d9 100644
--- a/lib/experimental-default-theme.json
+++ b/lib/experimental-default-theme.json
@@ -122,6 +122,44 @@
 					"slug": "vivid-cyan-blue-to-vivid-purple",
 					"value": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)"
 				}
+			],
+			"padding": [
+				{
+					"slug": "unit",
+					"value": 8
+				},
+				{
+					"slug": "unit-05",
+					"value": "calc(0.5 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-10",
+					"value": "calc(1 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-15",
+					"value": "calc(1.5 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-20",
+					"value": "calc(2 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-30",
+					"value": "calc(3 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-40",
+					"value": "calc(4 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-50",
+					"value": "calc(5 * var(--wp--preset--padding--unit))"
+				},
+				{
+					"slug": "unit-60",
+					"value": "calc(6 * var(--wp--preset--padding--unit))"
+				}
 			]
 		},
 		"features": {

From 2685498f0406ef1063ee5afb34b69966d16bb096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <andres.maneiro@automattic.com>
Date: Tue, 9 Jun 2020 16:49:02 +0200
Subject: [PATCH 2/3] Absorb cover padding via theme.json

---
 lib/experimental-default-theme.json         | 7 +++++++
 lib/global-styles.php                       | 2 ++
 packages/block-library/src/cover/style.scss | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/experimental-default-theme.json b/lib/experimental-default-theme.json
index a62614d2f08d9..0c0d9a22de87c 100644
--- a/lib/experimental-default-theme.json
+++ b/lib/experimental-default-theme.json
@@ -167,5 +167,12 @@
 				"dropCap": false
 			}
 		}
+	},
+	"core/cover": {
+		"styles": {
+			"spacing": {
+				"padding": "var(--wp--preset--padding--unit-20)"
+			}
+		}
 	}
 }
diff --git a/lib/global-styles.php b/lib/global-styles.php
index 166d84df01bad..6032160b41335 100644
--- a/lib/global-styles.php
+++ b/lib/global-styles.php
@@ -281,6 +281,7 @@ function gutenberg_experimental_global_styles_get_supported_styles( $supports )
 		'background'       => array( '__experimentalColor', 'gradients' ),
 		'line-height'      => array( '__experimentalLineHeight' ),
 		'font-size'        => array( '__experimentalFontSize' ),
+		'padding'          => array( '__experimentalPadding' ),
 	);
 
 	$supported_features = array();
@@ -381,6 +382,7 @@ function gutenberg_experimental_global_styles_flatten_styles_tree( $styles ) {
 		'background-color'         => array( 'color', 'background' ),
 		'color'                    => array( 'color', 'text' ),
 		'--wp--style--color--link' => array( 'color', 'link' ),
+		'padding'                  => array( 'spacing', 'padding' ),
 	);
 
 	$result = array();
diff --git a/packages/block-library/src/cover/style.scss b/packages/block-library/src/cover/style.scss
index 86813acf7f7c4..76e256cc23b43 100644
--- a/packages/block-library/src/cover/style.scss
+++ b/packages/block-library/src/cover/style.scss
@@ -9,7 +9,6 @@
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	padding: $grid-unit-20;
 
 	&.has-parallax {
 		background-attachment: fixed;

From 744a5f3eb6f622bb23dc4ed8528e6388e33309e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <andres.maneiro@automattic.com>
Date: Tue, 9 Jun 2020 17:24:10 +0200
Subject: [PATCH 3/3] Remove padding preset values

---
 lib/experimental-default-theme.json | 40 +----------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/lib/experimental-default-theme.json b/lib/experimental-default-theme.json
index 0c0d9a22de87c..efaba58157a27 100644
--- a/lib/experimental-default-theme.json
+++ b/lib/experimental-default-theme.json
@@ -122,44 +122,6 @@
 					"slug": "vivid-cyan-blue-to-vivid-purple",
 					"value": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)"
 				}
-			],
-			"padding": [
-				{
-					"slug": "unit",
-					"value": 8
-				},
-				{
-					"slug": "unit-05",
-					"value": "calc(0.5 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-10",
-					"value": "calc(1 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-15",
-					"value": "calc(1.5 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-20",
-					"value": "calc(2 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-30",
-					"value": "calc(3 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-40",
-					"value": "calc(4 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-50",
-					"value": "calc(5 * var(--wp--preset--padding--unit))"
-				},
-				{
-					"slug": "unit-60",
-					"value": "calc(6 * var(--wp--preset--padding--unit))"
-				}
 			]
 		},
 		"features": {
@@ -171,7 +133,7 @@
 	"core/cover": {
 		"styles": {
 			"spacing": {
-				"padding": "var(--wp--preset--padding--unit-20)"
+				"padding": 16
 			}
 		}
 	}