Vetro: use latest duotone features (#6910)

* Update duotone presets and apply to image and cover blocks.

* Remove duotone from block specific attributes.

* Title the variations.

* Remove title from default theme.json.

* Replace screenshot.

* Fix php version.

vetro/readme.txt

@@ -1,8 +1,8 @@
 === Vetro ===
 Contributors: Automattic
 Requires at least: 5.8
-Tested up to: 6.1
-Requires PHP: 5.7
+Tested up to: 6.2
+Requires PHP: 5.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 

vetro/style.css

@@ -5,8 +5,8 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Vetro was designed to be a portfolio theme, and is composed by wide width layouts with the impact of generous imagery and typography. Its simple pages are aligned left with fair right paddings and large content blocks to grant viewers focus on visuals and short paragraphs.
 Requires at least: 5.8
-Tested up to: 6.1
-Requires PHP: 5.7
+Tested up to: 6.2
+Requires PHP: 5.6
 Version: 1.0.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

vetro/styles/coolorchids.json

@@ -1,4 +1,5 @@
 {
+	"title": "Orchids",
 	"settings": {
 		"appearanceTools": true,
 		"color": {
@@ -15,6 +16,13 @@
 					"name": "Background",
 					"slug": "background"
 				}
+			],
+			"duotone": [
+				{
+					"colors": ["#063559", "#DA90BD"],
+					"slug": "default",
+					"name": "Default"
+				}
 			]
 		},
 		"custom": {
@@ -41,14 +49,7 @@
 			"wideSize": "1440px"
 		},
 		"spacing": {
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"units": ["%", "px", "em", "rem", "vh", "vw"]
 		},
 		"typography": {
 			"customFontSize": true,
@@ -90,17 +91,13 @@
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "500",
-							"src": [
-								"file:./assets/fonts/inter_500.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_500.ttf"]
 						},
 						{
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "600",
-							"src": [
-								"file:./assets/fonts/inter_600.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_600.ttf"]
 						}
 					],
 					"fontFamily": "Inter",
@@ -314,5 +311,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/wp/6.1/theme.json"
-}
+	"$schema": "https://schemas.wp.org/wp/6.2/theme.json"
+}

vetro/styles/eggplantlemon.json

@@ -1,4 +1,5 @@
 {
+	"title": "Lemon",
 	"settings": {
 		"appearanceTools": true,
 		"color": {
@@ -15,6 +16,13 @@
 					"name": "Background",
 					"slug": "background"
 				}
+			],
+			"duotone": [
+				{
+					"colors": ["#39021a", "#EDE550"],
+					"slug": "default",
+					"name": "Default"
+				}
 			]
 		},
 		"custom": {
@@ -41,14 +49,7 @@
 			"wideSize": "1440px"
 		},
 		"spacing": {
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"units": ["%", "px", "em", "rem", "vh", "vw"]
 		},
 		"typography": {
 			"customFontSize": true,
@@ -90,17 +91,13 @@
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "500",
-							"src": [
-								"file:./assets/fonts/inter_500.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_500.ttf"]
 						},
 						{
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "600",
-							"src": [
-								"file:./assets/fonts/inter_600.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_600.ttf"]
 						}
 					],
 					"fontFamily": "Inter",
@@ -314,5 +311,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/wp/6.1/theme.json"
-}
+	"$schema": "https://schemas.wp.org/wp/6.2/theme.json"
+}

vetro/styles/neutral.json

@@ -1,4 +1,5 @@
 {
+	"title": "Neutral",
 	"settings": {
 		"appearanceTools": true,
 		"color": {
@@ -15,6 +16,13 @@
 					"name": "Background",
 					"slug": "background"
 				}
+			],
+			"duotone": [
+				{
+					"colors": ["#111111", "#DADADA"],
+					"slug": "default",
+					"name": "Default"
+				}
 			]
 		},
 		"custom": {
@@ -41,14 +49,7 @@
 			"wideSize": "1440px"
 		},
 		"spacing": {
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"units": ["%", "px", "em", "rem", "vh", "vw"]
 		},
 		"typography": {
 			"customFontSize": true,
@@ -90,17 +91,13 @@
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "500",
-							"src": [
-								"file:./assets/fonts/inter_500.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_500.ttf"]
 						},
 						{
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "600",
-							"src": [
-								"file:./assets/fonts/inter_600.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_600.ttf"]
 						}
 					],
 					"fontFamily": "Inter",
@@ -316,5 +313,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/wp/6.1/theme.json"
-}
+	"$schema": "https://schemas.wp.org/wp/6.2/theme.json"
+}

vetro/templates/archive.html

@@ -4,7 +4,7 @@
 <main class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"0px","bottom":"0px","left":"0px","right":"30%"},"margin":{"top":"180px","bottom":"90px"},"blockGap":"0px"}},"layout":{"type":"default"}} -->
 <div class="wp-block-group alignwide" style="margin-top:180px;margin-bottom:90px;padding-top:0px;padding-right:30%;padding-bottom:0px;padding-left:0px"><!-- wp:query {"queryId":30,"query":{"perPage":"10","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":2},"layout":{"type":"default"}} -->
 <div class="wp-block-query"><!-- wp:post-template -->
-<!-- wp:post-featured-image {"isLink":true,"width":"","height":"360px","style":{"border":{"radius":"8px"},"color":{"duotone":["#063559","#dadada"]}}} /-->
+<!-- wp:post-featured-image {"isLink":true,"width":"","height":"360px","style":{"border":{"radius":"8px"}}} /-->
 
 <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1","fontStyle":"normal","fontWeight":"600","letterSpacing":"-1px","fontSize":"2rem"},"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
 

vetro/templates/index.html

@@ -7,7 +7,7 @@
 
 <!-- wp:query {"queryId":0,"query":{"perPage":"2","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"only","inherit":false},"displayLayout":{"type":"flex","columns":2},"align":"wide"} -->
 <div class="wp-block-query alignwide"><!-- wp:post-template -->
-<!-- wp:post-featured-image {"isLink":true,"height":"640px","style":{"border":{"radius":"8px"},"color":{"duotone":["#063559","#dadada"]}}} /-->
+<!-- wp:post-featured-image {"isLink":true,"height":"640px","style":{"border":{"radius":"8px"}}} /-->
 
 <!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"2rem","lineHeight":"1","fontStyle":"normal","fontWeight":"600","letterSpacing":"-1px"},"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
 
@@ -23,7 +23,7 @@
 
 <!-- wp:query {"queryId":1,"query":{"perPage":"8","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"displayLayout":{"type":"flex","columns":4},"align":"wide"} -->
 <div class="wp-block-query alignwide"><!-- wp:post-template -->
-<!-- wp:post-featured-image {"isLink":true,"width":"","height":"360px","style":{"border":{"radius":"8px"},"color":{"duotone":["#063559","#dadada"]}}} /-->
+<!-- wp:post-featured-image {"isLink":true,"width":"","height":"360px","style":{"border":{"radius":"8px"}}} /-->
 
 <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1","fontSize":"2rem","fontStyle":"normal","fontWeight":"600","letterSpacing":"-1px"},"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
 

vetro/templates/search.html

@@ -8,7 +8,7 @@
 
 <!-- wp:query {"query":{"perPage":"6","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"list","columns":2},"layout":{"type":"default"}} -->
 <div class="wp-block-query"><!-- wp:post-template -->
-<!-- wp:post-featured-image {"isLink":true,"width":"","height":"640px","style":{"border":{"radius":"8px"},"color":{"duotone":["#063559","#dadada"]}}} /-->
+<!-- wp:post-featured-image {"isLink":true,"width":"","height":"640px","style":{"border":{"radius":"8px"}}} /-->
 
 <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.1","fontSize":"4rem","fontStyle":"normal","fontWeight":"600","letterSpacing":"-1px"},"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
 

vetro/templates/single.html

@@ -53,7 +53,7 @@
 <div style="height:90px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"bottom":"0px","top":"0px"},"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}},"color":{"duotone":["#063559","#dadada"]}}} /-->
+<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"bottom":"0px","top":"0px"},"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}}} /-->
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"0px","right":"25%","bottom":"0px","left":"0px"},"blockGap":"0px","margin":{"top":"0px","bottom":"0px"}},"border":{"top":{"color":"var:preset|color|foreground","width":"1px"}}},"layout":{"type":"default"}} -->
 <div class="wp-block-group alignfull" style="border-top-color:var(--wp--preset--color--foreground);border-top-width:1px;margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:25%;padding-bottom:0px;padding-left:0px"></div>
@@ -67,7 +67,7 @@
 <!-- wp:comment-template {"style":{"typography":{"lineHeight":"1","fontStyle":"normal","fontWeight":"500"}},"fontSize":"small"} -->
 <!-- wp:columns {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"40px","left":"0px"}}}} -->
 <div class="wp-block-columns" style="padding-top:0px;padding-right:0px;padding-bottom:40px;padding-left:0px"><!-- wp:column {"width":"40px"} -->
-<div class="wp-block-column" style="flex-basis:40px"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"4px","width":"1px"},"color":{"duotone":["#063559","#dadada"]}},"borderColor":"foreground"} /--></div>
+<div class="wp-block-column" style="flex-basis:40px"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"4px","width":"1px"}},"borderColor":"foreground"} /--></div>
 <!-- /wp:column -->
 
 <!-- wp:column {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"blockGap":"0px"}}} -->

vetro/theme.json

@@ -5,26 +5,26 @@
 			"custom": true,
 			"customGradient": true,
 			"duotone": [
-                {
-                    "colors": [ "#063559", "#DADADA" ],
-                    "slug": "default",
-                    "name": "Default"
-                },
-                {
-                    "colors": [ "#063559", "#62FF88" ],
-                    "slug": "ooze",
-                    "name": "Ooze"
-                },
-                {
-                    "colors": [ "#063559", "#EDE550" ],
-                    "slug": "lemon",
-                    "name": "Lemon"
-                },
-                {
-                    "colors": [ "#063559", "#DA90BD" ],
-                    "slug": "pink",
-                    "name": "Pink"
-                }
+				{
+					"colors": ["#063559", "#62FF88"],
+					"slug": "default",
+					"name": "Default"
+				},
+				{
+					"colors": ["#063559", "#DADADA"],
+					"slug": "neutral",
+					"name": "Neutral"
+				},
+				{
+					"colors": ["#063559", "#EDE550"],
+					"slug": "lemon",
+					"name": "Lemon"
+				},
+				{
+					"colors": ["#063559", "#DA90BD"],
+					"slug": "pink",
+					"name": "Pink"
+				}
 			],
 			"palette": [
 				{
@@ -63,14 +63,7 @@
 			"wideSize": "1440px"
 		},
 		"spacing": {
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"units": ["%", "px", "em", "rem", "vh", "vw"]
 		},
 		"typography": {
 			"customFontSize": true,
@@ -112,17 +105,13 @@
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "500",
-							"src": [
-								"file:./assets/fonts/inter_500.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_500.ttf"]
 						},
 						{
 							"fontFamily": "Inter",
 							"fontStyle": "normal",
 							"fontWeight": "600",
-							"src": [
-								"file:./assets/fonts/inter_600.ttf"
-							]
+							"src": ["file:./assets/fonts/inter_600.ttf"]
 						}
 					],
 					"fontFamily": "Inter",
@@ -164,6 +153,16 @@
 					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
+			"core/cover": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default)"
+				}
+			},
+			"core/image": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default)"
+				}
+			},
 			"core/post-comments": {
 				"spacing": {
 					"padding": {
@@ -171,6 +170,11 @@
 					}
 				}
 			},
+			"core/post-featured-image": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default)"
+				}
+			},
 			"core/post-title": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--source-serif-pro)",
@@ -357,5 +361,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/wp/6.1/theme.json"
-}
+	"$schema": "https://schemas.wp.org/wp/6.2/theme.json"
+}