From fd8cea6abb2767dec6f83a51d8ccc7b3b24abb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Fri, 22 Jan 2021 18:55:49 +0100 Subject: [PATCH 1/3] Adapt for new shape --- tt1-blocks/experimental-theme.json | 84 +++++++++++------------------- 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/tt1-blocks/experimental-theme.json b/tt1-blocks/experimental-theme.json index c9c3628d..4e28550b 100644 --- a/tt1-blocks/experimental-theme.json +++ b/tt1-blocks/experimental-theme.json @@ -1,6 +1,6 @@ { - "global": { - "settings": { + "settings": { + "global": { "color": { "palette": [ { @@ -219,9 +219,11 @@ "vertical": "30px" } } - }, - "styles": { - "color": { + } + }, + "styles": { + "global": { + "color": { "background": "var(--wp--preset--color--green)", "text": "var(--wp--preset--color--dark-gray)", "link": "var(--wp--preset--color--dark-gray)" @@ -230,97 +232,73 @@ "fontSize": "var(--wp--preset--font-size--normal)", "lineHeight": "var(--wp--custom--line-height--body)" } - } - }, - "core/heading/h1": { - "styles": { + }, + "core/heading/h1": { "typography": { "fontSize": "var(--wp--preset--font-size--gigantic)", "lineHeight": 1.1 } - } - }, - "core/heading/h2": { - "styles": { + }, + "core/heading/h2": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-large)", "lineHeight": "var(--wp--custom--line-height--heading)" } - } - }, - "core/heading/h3": { - "styles": { + }, + "core/heading/h3": { "typography": { "fontSize": "calc(1.25 * var(--wp--preset--font-size--large))", "lineHeight": "var(--wp--custom--line-height--heading)" } - } - }, - "core/heading/h4": { - "styles": { + }, + "core/heading/h4": { "typography": { "fontSize": "var(--wp--preset--font-size--large)", "lineHeight": "var(--wp--custom--line-height--heading)" } - } - }, - "core/heading/h5": { - "styles": { + }, + "core/heading/h5": { "typography": { "fontSize": "var(--wp--preset--font-size--small)", "lineHeight": "var(--wp--custom--line-height--heading)" } - } - }, - "core/heading/h6": { - "styles": { + }, + "core/heading/h6": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", "lineHeight": "var(--wp--custom--line-height--heading)" } - } - }, - "core/site-tagline": { - "styles": { + }, + "core/site-tagline": { "typography": { "fontSize": "var(--wp--preset--font-size--small)", "lineHeight": 1.4 } - } - }, - "core/site-title": { - "styles": { + }, + "core/site-title": { "typography": { "fontSize": "var(--wp--preset--font-size--large)" } - } - }, - "core/post-author": { - "styles": { + }, + "core/post-author": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", "lineHeight": "var(--wp--custom--line-height--body)" } - } - }, - "core/post-date": { - "styles": { + }, + "core/post-date": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", "lineHeight": "var(--wp--custom--line-height--body)" } - } - }, - "core/post-hierarchical-terms": { - "styles": { + }, + "core/post-hierarchical-terms": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", "lineHeight": "var(--wp--custom--line-height--body)" } - } - }, - "core/post-tags": { - "styles": { + }, + "core/post-tags": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", "lineHeight": "var(--wp--custom--line-height--body)" From 4fd9867da85d42b6173b5d08f40fd05919825599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Wed, 27 Jan 2021 22:55:23 +0100 Subject: [PATCH 2/3] Update block selector names --- tt1-blocks/experimental-theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tt1-blocks/experimental-theme.json b/tt1-blocks/experimental-theme.json index 4e28550b..84c49c9a 100644 --- a/tt1-blocks/experimental-theme.json +++ b/tt1-blocks/experimental-theme.json @@ -1,6 +1,6 @@ { "settings": { - "global": { + "*": { "color": { "palette": [ { @@ -222,7 +222,7 @@ } }, "styles": { - "global": { + "root": { "color": { "background": "var(--wp--preset--color--green)", "text": "var(--wp--preset--color--dark-gray)", From 98234e4ac34b4bc73bc1b15deb780634cb85fde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Thu, 28 Jan 2021 13:28:07 +0100 Subject: [PATCH 3/3] Bring back global, so this can be merged --- tt1-blocks/experimental-theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tt1-blocks/experimental-theme.json b/tt1-blocks/experimental-theme.json index 84c49c9a..4e28550b 100644 --- a/tt1-blocks/experimental-theme.json +++ b/tt1-blocks/experimental-theme.json @@ -1,6 +1,6 @@ { "settings": { - "*": { + "global": { "color": { "palette": [ { @@ -222,7 +222,7 @@ } }, "styles": { - "root": { + "global": { "color": { "background": "var(--wp--preset--color--green)", "text": "var(--wp--preset--color--dark-gray)",