From d43adbf0da790d0be1bdb2cbf0ae672d35fe0594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sat, 8 Oct 2022 15:11:53 +0000 Subject: [PATCH 1/2] Reorder property and fix validation error in json files --- styles/aubergine.json | 7 +- styles/block-out.json | 7 +- styles/canary.json | 7 +- styles/electric.json | 7 +- styles/grapes.json | 7 +- styles/marigold.json | 560 ++++++++++++++++++++--------------------- styles/pilgrimage.json | 7 +- styles/pitch.json | 7 +- styles/sherbet.json | 1 - styles/whisper.json | 7 +- 10 files changed, 301 insertions(+), 316 deletions(-) diff --git a/styles/aubergine.json b/styles/aubergine.json index b92a6dc..28dab6c 100644 --- a/styles/aubergine.json +++ b/styles/aubergine.json @@ -1,5 +1,6 @@ { - "title": "Aubergine", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "gradients": [ @@ -276,7 +277,5 @@ "typography": { "fontFamily": "var(--wp--preset--font-family--dm-sans)" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/block-out.json b/styles/block-out.json index 306d3e7..cc215d8 100644 --- a/styles/block-out.json +++ b/styles/block-out.json @@ -1,5 +1,6 @@ { - "title": "Block out", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "duotone": [ @@ -216,7 +217,5 @@ "typography": { "fontFamily": "var(--wp--preset--font-family--dm-sans)" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/canary.json b/styles/canary.json index a74deac..45bb67c 100644 --- a/styles/canary.json +++ b/styles/canary.json @@ -1,5 +1,6 @@ { - "title": "Canary", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "duotone": [ @@ -240,7 +241,5 @@ "typography": { "fontFamily": "var(--wp--preset--font-family--ibm-plex-mono)" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/electric.json b/styles/electric.json index 374451a..5307726 100644 --- a/styles/electric.json +++ b/styles/electric.json @@ -1,5 +1,6 @@ { - "title": "Electric", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "palette": [ @@ -89,7 +90,5 @@ "typography": { "fontFamily": "var(--wp--preset--font-family--dm-sans)" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/grapes.json b/styles/grapes.json index 5f7377c..c561a7f 100644 --- a/styles/grapes.json +++ b/styles/grapes.json @@ -1,5 +1,6 @@ { - "title": "Grapes", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "palette": [ @@ -86,7 +87,5 @@ } } } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/marigold.json b/styles/marigold.json index 2d62ac0..55002fc 100644 --- a/styles/marigold.json +++ b/styles/marigold.json @@ -1,305 +1,299 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", - "title": "Marigold", + "version": 2, "settings": { - "color": { - "palette": [ - { - "color": "#F6F2EC", - "name": "Base", - "slug": "base" - }, - { - "color": "#21251F", - "name": "Contrast", - "slug": "contrast" - }, - { - "color": "#5B4460", - "name": "Primary", - "slug": "primary" - }, - { - "color": "#FCC263", - "name": "Secondary", - "slug": "secondary" - }, - { - "color": "#E7A1A9", - "name": "Tertiary", - "slug": "tertiary" - } - ] - }, - "layout": { - "wideSize": "1200px" - }, - "spacing": { - "spacingSizes": [ - { - "size": "clamp(0.625rem, 0.434rem + 0.61vw, 0.938rem)", - "name": "1", - "slug": "30" - }, - { - "size": "clamp(1.25rem, 0.869rem + 1.22vw, 1.875rem)", - "name": "2", - "slug": "40" - }, - { - "size": "clamp(1.875rem, 1.303rem + 1.83vw, 2.813rem)", - "name": "3", - "slug": "50" - }, - { - "size": "clamp(2.5rem, 1.738rem + 2.44vw, 3.75rem)", - "name": "4", - "slug": "60" - }, - { - "size": "clamp(2.813rem, 1.098rem + 5.49vw, 5.625rem)", - "name": "5", - "slug": "70" - }, - { - "size": "clamp(3.75rem, 1.463rem + 7.32vw, 7.5rem)", - "name": "6", - "slug": "80" - } - ] - }, - "typography": { - "fontSizes": [ - { - "size": "clamp(0.875rem, 0.799rem + 0.24vw, 1rem)", - "name": "Tiny", - "slug": "tiny" - }, - { - "size": "clamp(1rem, 0.924rem + 0.24vw, 1.125rem)", - "slug": "small" - }, - { - "size": "clamp(1.125rem, 1.049rem + 0.24vw, 1.25rem)", - "name": "Normal", - "slug": "normal" - }, - { - "size": "clamp(1.25rem, 1.021rem + 0.73vw, 1.625rem)", - "slug": "medium" - }, - { - "size": "clamp(1.375rem, 1.07rem + 0.98vw, 1.875rem)", - "slug": "large" - }, - { - "size": "clamp(1.75rem, 1.369rem + 1.22vw, 2.375rem)", - "slug": "x-large" + "color": { + "palette": [ + { + "color": "#F6F2EC", + "name": "Base", + "slug": "base" + }, + { + "color": "#21251F", + "name": "Contrast", + "slug": "contrast" + }, + { + "color": "#5B4460", + "name": "Primary", + "slug": "primary" + }, + { + "color": "#FCC263", + "name": "Secondary", + "slug": "secondary" + }, + { + "color": "#E7A1A9", + "name": "Tertiary", + "slug": "tertiary" + } + ] }, - { - "size": "clamp(2.125rem, 1.706rem + 1.34vw, 2.813rem)", - "slug": "xx-large" + "layout": { + "wideSize": "1200px" }, - { - "size": "clamp(2.5rem, 1.966rem + 1.71vw, 3.375rem)", - "name": "Huge", - "slug": "huge" + "spacing": { + "spacingSizes": [ + { + "size": "clamp(0.625rem, 0.434rem + 0.61vw, 0.938rem)", + "name": "1", + "slug": "30" + }, + { + "size": "clamp(1.25rem, 0.869rem + 1.22vw, 1.875rem)", + "name": "2", + "slug": "40" + }, + { + "size": "clamp(1.875rem, 1.303rem + 1.83vw, 2.813rem)", + "name": "3", + "slug": "50" + }, + { + "size": "clamp(2.5rem, 1.738rem + 2.44vw, 3.75rem)", + "name": "4", + "slug": "60" + }, + { + "size": "clamp(2.813rem, 1.098rem + 5.49vw, 5.625rem)", + "name": "5", + "slug": "70" + }, + { + "size": "clamp(3.75rem, 1.463rem + 7.32vw, 7.5rem)", + "name": "6", + "slug": "80" + } + ] }, - { - "size": "clamp(3.375rem, 2.384rem + 3.17vw, 5rem)", - "name": "Gigantic", - "slug": "gigantic" + "typography": { + "fontSizes": [ + { + "size": "clamp(0.875rem, 0.799rem + 0.24vw, 1rem)", + "name": "Tiny", + "slug": "tiny" + }, + { + "size": "clamp(1rem, 0.924rem + 0.24vw, 1.125rem)", + "slug": "small" + }, + { + "size": "clamp(1.125rem, 1.049rem + 0.24vw, 1.25rem)", + "name": "Normal", + "slug": "normal" + }, + { + "size": "clamp(1.25rem, 1.021rem + 0.73vw, 1.625rem)", + "slug": "medium" + }, + { + "size": "clamp(1.375rem, 1.07rem + 0.98vw, 1.875rem)", + "slug": "large" + }, + { + "size": "clamp(1.75rem, 1.369rem + 1.22vw, 2.375rem)", + "slug": "x-large" + }, + { + "size": "clamp(2.125rem, 1.706rem + 1.34vw, 2.813rem)", + "slug": "xx-large" + }, + { + "size": "clamp(2.5rem, 1.966rem + 1.71vw, 3.375rem)", + "name": "Huge", + "slug": "huge" + }, + { + "size": "clamp(3.375rem, 2.384rem + 3.17vw, 5rem)", + "name": "Gigantic", + "slug": "gigantic" + } + ] } - ] - } }, "styles": { - "blocks": { - "core/query": { - "spacing": { - "padding": { - "left": "0", - "right": "0" - } - } - }, - "core/post-content": { - "elements": { - "link": { - "color": { - "text": "var(--wp--preset--color--primary)" - } - } - } - }, - "core/post-excerpt": { - "typography": { - "fontSize": "var(--wp--preset--font-size--normal)" - } - }, - "core/post-title": { - "elements": { - "link": { - "typography": { - "fontSize": "var(--wp--preset--font-size--large)", - "textDecoration": "none" + "blocks": { + "core/query": { + "spacing": { + "padding": { + "left": "0", + "right": "0" + } + } }, - "color": { - "text": "var(--wp--preset--color--primary)" + "core/post-content": { + "elements": { + "link": { + "color": { + "text": "var(--wp--preset--color--primary)" + } + } + } }, - ":hover": { - "border": { - "bottom": true - } - } - } - }, - "spacing": { - "margin": { - "bottom": "var(--wp--preset--spacing--50)", - "top": "var(--wp--preset--spacing--50)" - } - }, - "typography": { - "fontWeight": "600" - } - }, - "core/pullquote": { - "border": { - "width": "1px 0" - } - }, - "core/query-pagination": { - "elements": { - "link": { - "typography": { - "textDecoration": "none" + "core/post-excerpt": { + "typography": { + "fontSize": "var(--wp--preset--font-size--normal)" + } + }, + "core/post-title": { + "elements": { + "link": { + "typography": { + "fontSize": "var(--wp--preset--font-size--large)", + "textDecoration": "none" + }, + "color": { + "text": "var(--wp--preset--color--primary)" + } + } + }, + "spacing": { + "margin": { + "bottom": "var(--wp--preset--spacing--50)", + "top": "var(--wp--preset--spacing--50)" + } + }, + "typography": { + "fontWeight": "600" + } + }, + "core/pullquote": { + "border": { + "width": "1px 0" + } + }, + "core/query-pagination": { + "elements": { + "link": { + "typography": { + "textDecoration": "none" + } + } + }, + "typography": { + "fontSize": "var(--wp--preset--font-size--small)", + "fontWeight": "400" + } + }, + "core/quote": { + "elements": { + "cite": { + "typography": { + "fontSize": "1.25rem" + } + } + }, + "typography": { + "fontSize": "1.625rem", + "lineHeight": "1.5" + } + }, + "core/site-title": { + "elements": { + "link": { + "typography": { + "fontSize": "var(--wp--preset--font-size--normal)" + } + } + }, + "typography": { + "textTransform": "lowercase" + } } - } }, - "typography": { - "fontSize": "var(--wp--preset--font-size--small)", - "fontWeight": "400" - } - }, - "core/quote": { "elements": { - "cite": { - "typography": { - "fontSize": "1.25rem" + "h1": { + "typography": { + "fontSize": "var(--wp--preset--font-size--huge)", + "lineHeight": "1.1" + } + }, + "h2": { + "typography": { + "fontSize": "var(--wp--preset--font-size--xx-large)", + "lineHeight": "1.2" + } + }, + "h3": { + "typography": { + "fontSize": "var(--wp--preset--font-size--x-large)", + "lineHeight": "1.2" + } + }, + "h4": { + "typography": { + "fontSize": "var(--wp--preset--font-size--large)", + "fontWeight": "600" + } + }, + "h5": { + "typography": { + "fontStyle": "normal", + "fontWeight": "600", + "textTransform": "none" + } + }, + "h6": { + "typography": { + "fontSize": "var(--wp--preset--font-size--normal)", + "fontStyle": "normal", + "fontWeight": "600" + } + }, + "heading": { + "typography": { + "fontStyle": "italic" + } + }, + "link": { + ":hover": { + "typography": { + "textDecoration": "none" + } + } + }, + "button": { + "border": { + "radius": "50px" + }, + "color": { + "background": "var(--wp--preset--color--secondary)" + }, + "typography": { + "fontSize": "var(--wp--preset--font-size--normal)" + }, + ":hover": { + "color": { + "background": "var(--wp--preset--color--tertiary)" + } + }, + ":focus": { + "color": { + "background": "var(--wp--preset--color--primary)" + } + }, + ":active": { + "color": { + "background": "var(--wp--preset--color--primary)" + } + } } - } }, - "typography": { - "fontSize": "1.625rem", - "lineHeight": "1.5" - } - }, - "core/site-title": { - "elements": { - "link": { - "typography": { - "fontSize": "var(--wp--preset--font-size--normal)" + "spacing": { + "blockGap": "2.5rem", + "padding": { + "bottom": "var(--wp--preset--spacing--50)", + "left": "var(--wp--preset--spacing--40)", + "right": "var(--wp--preset--spacing--40)", + "top": "var(--wp--preset--spacing--50)" } - } }, "typography": { - "textTransform": "lowercase" + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontSize": "var(--wp--preset--font-size--normal)", + "lineHeight": "1.5" } - } - }, - "elements": { - "h1": { - "typography": { - "fontSize": "var(--wp--preset--font-size--huge)", - "lineHeight": "1.1" - } - }, - "h2": { - "typography": { - "fontSize": "var(--wp--preset--font-size--xx-large)", - "lineHeight": "1.2" - } - }, - "h3": { - "typography": { - "fontSize": "var(--wp--preset--font-size--x-large)", - "lineHeight": "1.2" - } - }, - "h4": { - "typography": { - "fontSize": "var(--wp--preset--font-size--large)", - "fontWeight": "600" - } - }, - "h5": { - "typography": { - "fontStyle": "normal", - "fontWeight": "600", - "textTransform": "none" - } - }, - "h6": { - "typography": { - "fontSize": "var(--wp--preset--font-size--normal)", - "fontStyle": "normal", - "fontWeight": "600" - } - }, - "heading": { - "typography": { - "fontStyle": "italic" - } - }, - "link": { - ":hover": { - "typography": { - "textDecoration": "none" - } - } - }, - "button": { - "border": { - "radius": "50px" - }, - "color": { - "background": "var(--wp--preset--color--secondary)" - }, - "typography": { - "fontSize": "var(--wp--preset--font-size--normal)" - }, - ":hover": { - "color": { - "background": "var(--wp--preset--color--tertiary)" - } - }, - ":focus": { - "color": { - "background": "var(--wp--preset--color--primary)" - } - }, - ":active": { - "color": { - "background": "var(--wp--preset--color--primary)" - } - } - } - }, - "spacing": { - "blockGap": "2.5rem", - "padding": { - "bottom": "var(--wp--preset--spacing--50)", - "left": "var(--wp--preset--spacing--40)", - "right": "var(--wp--preset--spacing--40)", - "top": "var(--wp--preset--spacing--50)" - } - }, - "typography": { - "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", - "fontSize": "var(--wp--preset--font-size--normal)", - "lineHeight": "1.5" } - }, - "version": 2 } diff --git a/styles/pilgrimage.json b/styles/pilgrimage.json index b3099aa..f12fb58 100644 --- a/styles/pilgrimage.json +++ b/styles/pilgrimage.json @@ -1,5 +1,6 @@ { - "title": "Pilgrimage", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "duotone": [ @@ -295,7 +296,5 @@ } } } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/pitch.json b/styles/pitch.json index 4c74624..701e8aa 100644 --- a/styles/pitch.json +++ b/styles/pitch.json @@ -1,5 +1,6 @@ { - "title": "Pitch", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "palette": [ @@ -239,7 +240,5 @@ "fontSize": "var(--wp--preset--font-size--medium)", "lineHeight": "1.7" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } diff --git a/styles/sherbet.json b/styles/sherbet.json index d6e2039..b95f42f 100644 --- a/styles/sherbet.json +++ b/styles/sherbet.json @@ -1,7 +1,6 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, - "title": "Sherbet", "settings": { "color": { "duotone": [ diff --git a/styles/whisper.json b/styles/whisper.json index 2c28af8..3f4863e 100644 --- a/styles/whisper.json +++ b/styles/whisper.json @@ -1,5 +1,6 @@ { - "title": "Whisper", + "$schema": "https://schemas.wp.org/trunk/theme.json", + "version": 2, "settings": { "color": { "palette": [ @@ -509,7 +510,5 @@ "typography": { "fontFamily": "var(--wp--preset--font-family--dm-sans)" } - }, - "version": 2, - "$schema": "https://schemas.wp.org/trunk/theme.json" + } } From 1303028d8b8bd779e03845d699d4eb7a1a66250a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tetsuaki=20Hamano=20/=20=E6=B5=9C=E9=87=8E=20=E5=93=B2?= =?UTF-8?q?=E6=98=8E?= Date: Sun, 9 Oct 2022 07:01:32 +0000 Subject: [PATCH 2/2] Revert title property in json files --- styles/aubergine.json | 1 + styles/block-out.json | 1 + styles/canary.json | 1 + styles/electric.json | 1 + styles/grapes.json | 1 + styles/marigold.json | 1 + styles/pilgrimage.json | 1 + styles/pitch.json | 1 + styles/sherbet.json | 1 + styles/whisper.json | 1 + 10 files changed, 10 insertions(+) diff --git a/styles/aubergine.json b/styles/aubergine.json index 28dab6c..545e129 100644 --- a/styles/aubergine.json +++ b/styles/aubergine.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Aubergine", "settings": { "color": { "gradients": [ diff --git a/styles/block-out.json b/styles/block-out.json index cc215d8..ae6594f 100644 --- a/styles/block-out.json +++ b/styles/block-out.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Block out", "settings": { "color": { "duotone": [ diff --git a/styles/canary.json b/styles/canary.json index 45bb67c..852f246 100644 --- a/styles/canary.json +++ b/styles/canary.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Canary", "settings": { "color": { "duotone": [ diff --git a/styles/electric.json b/styles/electric.json index 5307726..6dae63e 100644 --- a/styles/electric.json +++ b/styles/electric.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Electric", "settings": { "color": { "palette": [ diff --git a/styles/grapes.json b/styles/grapes.json index c561a7f..25a007f 100644 --- a/styles/grapes.json +++ b/styles/grapes.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Grapes", "settings": { "color": { "palette": [ diff --git a/styles/marigold.json b/styles/marigold.json index 55002fc..0cd9ab3 100644 --- a/styles/marigold.json +++ b/styles/marigold.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Marigold", "settings": { "color": { "palette": [ diff --git a/styles/pilgrimage.json b/styles/pilgrimage.json index f12fb58..52a0e92 100644 --- a/styles/pilgrimage.json +++ b/styles/pilgrimage.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Pilgrimage", "settings": { "color": { "duotone": [ diff --git a/styles/pitch.json b/styles/pitch.json index 701e8aa..e5b174a 100644 --- a/styles/pitch.json +++ b/styles/pitch.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Pitch", "settings": { "color": { "palette": [ diff --git a/styles/sherbet.json b/styles/sherbet.json index b95f42f..d6e2039 100644 --- a/styles/sherbet.json +++ b/styles/sherbet.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Sherbet", "settings": { "color": { "duotone": [ diff --git a/styles/whisper.json b/styles/whisper.json index 3f4863e..16b6807 100644 --- a/styles/whisper.json +++ b/styles/whisper.json @@ -1,6 +1,7 @@ { "$schema": "https://schemas.wp.org/trunk/theme.json", "version": 2, + "title": "Whisper", "settings": { "color": { "palette": [