From c9914c77890132175f808b0eb1cbd30beaed6e3f Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Mon, 25 Oct 2021 06:03:36 -1000 Subject: [PATCH 1/2] Fix margin and padding in block.json Merged enums in margin and padding since they can be used together according to https://github.com/WordPress/gutenberg/pull/31774 --- src/schemas/json/block.json | 40 ++++--------------------------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/src/schemas/json/block.json b/src/schemas/json/block.json index eb4ea612603..91042546f94 100644 --- a/src/schemas/json/block.json +++ b/src/schemas/json/block.json @@ -289,24 +289,8 @@ "top", "right", "left", - "bottom" - ] - } - }, - { - "type": "array", - "items": { - "type": "string", - "enum": [ - "vertical" - ] - } - }, - { - "type": "array", - "items": { - "type": "string", - "enum": [ + "bottom", + "vertical", "horizontal" ] } @@ -326,24 +310,8 @@ "top", "right", "left", - "bottom" - ] - } - }, - { - "type": "array", - "items": { - "type": "string", - "enum": [ - "vertical" - ] - } - }, - { - "type": "array", - "items": { - "type": "string", - "enum": [ + "bottom", + "vertical", "horizontal" ] } From 9a9e50a4c2d818bd1f46b54701130fa287fdd0de Mon Sep 17 00:00:00 2001 From: Alex Lende Date: Mon, 25 Oct 2021 06:14:38 -1000 Subject: [PATCH 2/2] Update block.json --- src/schemas/json/block.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/schemas/json/block.json b/src/schemas/json/block.json index 91042546f94..4401520e44f 100644 --- a/src/schemas/json/block.json +++ b/src/schemas/json/block.json @@ -289,7 +289,15 @@ "top", "right", "left", - "bottom", + "bottom" + ] + } + }, + { + "type": "array", + "items": { + "type": "string", + "enum": [ "vertical", "horizontal" ] @@ -310,7 +318,15 @@ "top", "right", "left", - "bottom", + "bottom" + ] + } + }, + { + "type": "array", + "items": { + "type": "string", + "enum": [ "vertical", "horizontal" ]