Hall: Resolving conflicts and updating screenshot

hall/functions.php

@@ -8,7 +8,6 @@
  * @since Hall 1.0
  */
 
-declare( strict_types = 1 );
 
 if ( ! function_exists( 'hall_support' ) ) :
 

hall/patterns/comments.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Title: Comments
+ * slug: hall/comments
+ * inserter: no
+ */
+
+?>
+
+<!-- wp:comments {"className":"wp-block-comments-query-loop"} -->
+<div class="wp-block-comments wp-block-comments-query-loop">
+	<!-- wp:comments-title {"level":3} /-->
+
+	<!-- wp:comment-template -->
+		<!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}}} -->
+		<div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)">
+			<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"},"style":{"spacing":{"blockGap":"0.5em"}}} -->
+			<div class="wp-block-group">
+				<!-- wp:avatar {"size":40,"style":{"spacing":{"margin":{"top":"0.5em"}}}} /-->
+
+				<!-- wp:group -->
+				<div class="wp-block-group">
+					<!-- wp:comment-author-name /-->
+
+					<!-- wp:group {"layout":{"type":"flex"},"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}}} -->
+					<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px">
+						<!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a"} /-->
+
+						<!-- wp:comment-edit-link /-->
+					</div>
+					<!-- /wp:group -->
+				</div>
+				<!-- /wp:group -->
+			</div>
+			<!-- /wp:group -->
+
+			<!-- wp:comment-content /-->
+
+			<!-- wp:comment-reply-link /-->
+		</div>
+		<!-- /wp:group -->
+	<!-- /wp:comment-template -->
+
+	<!-- wp:comments-pagination -->
+		<!-- wp:comments-pagination-previous /-->
+		<!-- wp:comments-pagination-numbers /-->
+		<!-- wp:comments-pagination-next /-->
+	<!-- /wp:comments-pagination -->
+
+	<!-- wp:post-comments-form /-->
+</div>
+<!-- /wp:comments -->

hall/readme.txt

@@ -1,7 +1,7 @@
 === Hall ===
-Contributors: Automattic
+Contributors: the WordPress team
 Requires at least: 6.0
-Tested up to: 6.4
+Tested up to: 6.4.1
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -12,19 +12,16 @@ Hall is a blog theme that presents posts in different Query Loops through the us
 
 == Changelog ==
 
-= 1.0.1 =
-* Lossless image optimization (#7671)
-
-= 1.0.1 =
-* Optimize images (#7671)
-
 = 1.0.0 =
 * Initial release
 
 == Copyright ==
 
-Hall WordPress Theme, (C) 2023 
+Hall is based on Hal2 (), (C) , [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
-Hall is distributed under the terms of the GNU GPL.
+
+Hal2 WordPress Theme, (C) 2023 
+Hal2 is distributed under the terms of the GNU GPL.
+Hal2 is based on Hall1 (), (C) , [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -36,5 +33,24 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
-"Le bain de Vénus (The Bath of Venus)"
+https://en.m.wikipedia.org/wiki/File:Au_Mont_de_pit.jpg
-https://www.bellasartes.gob.ar/coleccion/obra/2687/
+https://commons.wikimedia.org/wiki/File:Vaches_dans_Paysage.jpg
+https://en.m.wikipedia.org/wiki/File:La_lechera_-_Casto_Plasencia.jpg
+https://commons.wikimedia.org/wiki/File:El_Almirante_Brown_llegando_a_puerto.jpg
+https://commons.wikimedia.org/wiki/File:Le_bain_de_Vnus_-_Odilon_Redon.jpg
+https://www.bellasartes.gob.ar/coleccion/obra/1742/
+https://commons.wikimedia.org/wiki/File:Retrato_de_mujer_joven_-_Rembrandt_van_Rijn.jpg
+https://www.bellasartes.gob.ar/coleccion/obra/9170/
+https://commons.wikimedia.org/wiki/File:La_vuelta_de_la_pesca_-_Joaqun_Sorolla_y_Bastida.jpg
+https://en.wikipedia.org/wiki/File:Autorretrato_-_Raymond_Monvoisin.jpg
+https://www.bellasartes.gob.ar/coleccion/obra/7988/
+https://www.bellasartes.gob.ar/coleccion/obra/6104/
+https://en.m.wikipedia.org/wiki/File:Caballos_en_libertad_-_Alfred_de_Dreux.jpg
+https://www.bellasartes.gob.ar/exhibiciones/tesoros-del-museo-arqueologico-nacional-de-taranto/
+
+Inter Display Font
+Copyright 2016 The Inter Project Authors 
+This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: http://scripts.sil.org/OFL 
+License URL: http://scripts.sil.org/OFL 
+Source: https://rsms.me/
+-- End of Inter Display Font credits --

hall/style.css

@@ -1,13 +1,13 @@
 /*
 Theme Name: Hall
-Theme URI: https://wordpress.com/theme/hall
+Theme URI: https://github.com/wordpress/hall/
-Author: Automattic
+Author: the WordPress team
-Author URI: https://automattic.com/
+Author URI: https://wordpress.org/themes/
 Description: Hall is a blog theme that presents posts in different Query Loops through the use of tags. The perfect pick for museums or galleries.
 Requires at least: 6.0
-Tested up to: 6.4
+Tested up to: 6.4.1
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: hall

hall/styles/dark-waters.json

@@ -0,0 +1,36 @@
+{
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"color": "#f6f3e9",
+					"name": "Base",
+					"slug": "base"
+				},
+				{
+					"color": "#2a404b",
+					"name": "Contrast",
+					"slug": "contrast"
+				},
+				{
+					"color": "#2a404b",
+					"name": "Primary",
+					"slug": "primary"
+				},
+				{
+					"color": "#20313c",
+					"name": "Secondary",
+					"slug": "secondary"
+				},
+				{
+					"color": "#f6f3e9",
+					"name": "Tertiary",
+					"slug": "tertiary"
+				}
+			]
+		}
+	},
+	"title": "Dark Waters",
+	"version": 2,
+	"$schema": "https://schemas.wp.org/trunk/theme.json"
+}

hall/styles/palm-leaf.json

@@ -0,0 +1,143 @@
+{
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"color": "#f6f3e9",
+					"name": "Base",
+					"slug": "base"
+				},
+				{
+					"color": "#434a2a",
+					"name": "Contrast",
+					"slug": "contrast"
+				},
+				{
+					"color": "#434a2a",
+					"name": "Primary",
+					"slug": "primary"
+				},
+				{
+					"color": "#353c20",
+					"name": "Secondary",
+					"slug": "secondary"
+				},
+				{
+					"color": "#f6f3e9",
+					"name": "Tertiary",
+					"slug": "tertiary"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/navigation": {
+				"spacing": {
+					"blockGap": "0rem"
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--rubik)",
+					"fontStyle": "normal",
+					"fontWeight": "700",
+					"lineHeight": "1.3",
+					"textTransform": "none"
+				}
+			},
+			"core/site-tagline": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				},
+				"typography": {
+					"lineHeight": "1.3"
+				}
+			},
+			"core/site-title": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				},
+				"typography": {
+					"fontSize": "4.8rem",
+					"letterSpacing": "-0.1rem",
+					"lineHeight": "0.75"
+				}
+			}
+		},
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"textTransform": "none"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
+					"fontStyle": "normal",
+					"fontWeight": "700"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)"
+				}
+			},
+			"h4": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)"
+				}
+			},
+			"h5": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)"
+				}
+			},
+			"heading": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)"
+				}
+			},
+			"link": {
+				":hover": {
+					"color": {
+						"text": "var(--wp--preset--color--secondary)"
+					}
+				},
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"typography": {
+					"textDecoration": "none"
+				}
+			}
+		},
+		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--overused-grotesk)",
+			"letterSpacing": "0.02rem",
+			"lineHeight": "1.5"
+		}
+	},
+	"title": "Palm Leaf",
+	"version": 2,
+	"$schema": "https://schemas.wp.org/trunk/theme.json"
+}

hall/styles/voodoo.json

@@ -0,0 +1,36 @@
+{
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"color": "#f2f6e9",
+					"name": "Base",
+					"slug": "base"
+				},
+				{
+					"color": "#4b303d",
+					"name": "Contrast",
+					"slug": "contrast"
+				},
+				{
+					"color": "#4b303d",
+					"name": "Primary",
+					"slug": "primary"
+				},
+				{
+					"color": "#2c1c21",
+					"name": "Secondary",
+					"slug": "secondary"
+				},
+				{
+					"color": "#f2f6e9",
+					"name": "Tertiary",
+					"slug": "tertiary"
+				}
+			]
+		}
+	},
+	"title": "Voodoo",
+	"version": 2,
+	"$schema": "https://schemas.wp.org/trunk/theme.json"
+}

hall/theme.json

@@ -2,38 +2,29 @@
 	"settings": {
 		"appearanceTools": true,
 		"color": {
-			"background": true,
-			"custom": true,
-			"customDuotone": true,
-			"customGradient": true,
-			"defaultDuotone": true,
-			"defaultGradients": true,
-			"defaultPalette": true,
-			"duotone": [],
-			"gradients": [],
 			"palette": [
 				{
-					"color": "#f6f5f4",
+					"color": "#f6f3e9",
 					"name": "Base",
 					"slug": "base"
 				},
 				{
-					"color": "#ff4b0a",
+					"color": "#933c1f",
 					"name": "Contrast",
 					"slug": "contrast"
 				},
 				{
-					"color": "#ff4b0a",
+					"color": "#933c1f",
 					"name": "Primary",
 					"slug": "primary"
 				},
 				{
-					"color": "#c42b08",
+					"color": "#7e341b",
 					"name": "Secondary",
 					"slug": "secondary"
 				},
 				{
-					"color": "#f6f5f4",
+					"color": "#f6f3e9",
 					"name": "Tertiary",
 					"slug": "tertiary"
 				}
@@ -44,17 +35,10 @@
 			"contentSize": "960px",
 			"wideSize": "1200px"
 		},
-		"shadow": {
-			"defaultPresets": true,
-			"presets": []
-		},
 		"spacing": {
 			"customSpacingSize": true,
 			"spacingScale": {
-				"increment": 1.5,
+				"increment": 1,
-				"mediumStep": 1.5,
-				"operator": "*",
-				"steps": 7,
 				"unit": "rem"
 			},
 			"spacingSizes": [],
@@ -73,6 +57,7 @@
 			"fluid": true,
 			"fontFamilies": [
 				{
+					"fontFace": [],
 					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
 					"name": "System Font",
 					"slug": "system-font"
@@ -80,64 +65,62 @@
 				{
 					"fontFace": [
 						{
-							"fontFamily": "Albert Sans",
+							"fontFamily": "Overused Grotesk",
-							"fontStyle": "normal",
-							"fontWeight": "400",
-							"src": [
-								"file:./assets/fonts/albert-sans_normal_400.ttf"
-							]
-						},
-						{
-							"fontFamily": "Albert Sans",
-							"fontStyle": "normal",
-							"fontWeight": "700",
-							"src": [
-								"file:./assets/fonts/albert-sans_normal_700.ttf"
-							]
-						},
-						{
-							"fontFamily": "Albert Sans",
 							"fontStyle": "italic",
 							"fontWeight": "400",
 							"src": [
-								"file:./assets/fonts/albert-sans_italic_400.ttf"
+								"file:./assets/fonts/overused-grotesk_italic_400.woff2"
 							]
 						},
 						{
-							"fontFamily": "Albert Sans",
+							"fontFamily": "Overused Grotesk",
-							"fontStyle": "italic",
+							"fontStyle": "normal",
-							"fontWeight": "700",
+							"fontWeight": "400",
 							"src": [
-								"file:./assets/fonts/albert-sans_italic_700.ttf"
+								"file:./assets/fonts/overused-grotesk_normal_400.woff2"
+							]
+						},
+						{
+							"fontFamily": "Overused Grotesk",
+							"fontStyle": "normal",
+							"fontWeight": "600",
+							"src": [
+								"file:./assets/fonts/overused-grotesk_normal_600.woff2"
+							]
+						},
+						{
+							"fontFamily": "Overused Grotesk",
+							"fontStyle": "italic",
+							"fontWeight": "600",
+							"src": [
+								"file:./assets/fonts/overused-grotesk_italic_600.woff2"
 							]
 						}
 					],
-					"fontFamily": "Albert Sans",
+					"fontFamily": "Overused Grotesk",
-					"name": "Albert Sans",
+					"slug": "overused-grotesk"
-					"slug": "albert-sans"
 				},
 				{
 					"fontFace": [
 						{
-							"fontFamily": "Roboto Condensed",
+							"fontFamily": "Inter Display",
 							"fontStyle": "normal",
-							"fontWeight": "700",
+							"fontWeight": "600",
 							"src": [
-								"file:./assets/fonts/roboto-condensed_normal_700.ttf"
+								"file:./assets/fonts/inter-display_normal_600.ttf"
 							]
 						},
 						{
-							"fontFamily": "Roboto Condensed",
+							"fontFamily": "Inter Display",
 							"fontStyle": "italic",
-							"fontWeight": "700",
+							"fontWeight": "600",
 							"src": [
-								"file:./assets/fonts/roboto-condensed_italic_700.ttf"
+								"file:./assets/fonts/inter-display_italic_600.ttf"
 							]
 						}
 					],
-					"fontFamily": "Roboto Condensed",
+					"fontFamily": "Inter Display",
-					"name": "Roboto Condensed",
+					"slug": "inter-display"
-					"slug": "roboto-condensed"
 				}
 			],
 			"fontSizes": [
@@ -322,7 +305,7 @@
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontStyle": "normal",
 					"fontWeight": "700",
-					"lineHeight": 1.4,
+					"lineHeight": 1.3999999999999999,
 					"textTransform": "uppercase"
 				}
 			},
@@ -354,11 +337,12 @@
 					"blockGap": "0rem"
 				},
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--rubik)",
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontStyle": "normal",
-					"fontWeight": "600",
+					"fontWeight": "700",
-					"lineHeight": "1.2",
+					"lineHeight": "1.3",
-					"textTransform": "uppercase"
+					"textTransform": "none"
 				}
 			},
 			"core/paragraph": {
@@ -507,11 +491,25 @@
 				}
 			},
 			"core/site-tagline": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.3"
 				}
 			},
 			"core/site-title": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
 				"elements": {
 					"link": {
 						":hover": {
@@ -519,14 +517,19 @@
 								"textDecoration": "underline"
 							}
 						},
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						},
 						"typography": {
 							"textDecoration": "none"
 						}
 					}
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontSize": "4.8rem",
-					"fontWeight": "700"
+					"fontWeight": "700",
+					"letterSpacing": "-0.1rem",
+					"lineHeight": "0.75"
 				}
 			}
 		},
@@ -575,24 +578,27 @@
 			},
 			"h1": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontStyle": "normal",
 					"fontWeight": "600",
 					"lineHeight": "1",
-					"textTransform": "uppercase"
+					"textTransform": "none"
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontStyle": "normal",
-					"fontWeight": "600",
+					"fontWeight": "700",
 					"lineHeight": "1.2",
 					"textTransform": "uppercase"
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontSize": "0.75rem",
 					"fontStyle": "normal",
 					"fontWeight": "600",
@@ -602,6 +608,7 @@
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontSize": "0.75rem",
 					"fontStyle": "normal",
 					"fontWeight": "700"
@@ -609,6 +616,7 @@
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontSize": "0.75rem",
 					"fontStyle": "normal",
 					"fontWeight": "700"
@@ -616,6 +624,7 @@
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontSize": "0.75rem"
 				}
 			},
@@ -624,19 +633,25 @@
 					"text": "var(--wp--preset--color--contrast)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--rubik)",
+					"fontFamily": "var(--wp--preset--font-family--inter-display)",
 					"fontWeight": "400",
 					"lineHeight": "1.125"
 				}
 			},
 			"link": {
 				":hover": {
+					"color": {
+						"text": "var(--wp--preset--color--secondary)"
+					},
 					"typography": {
 						"textDecoration": "none"
 					}
 				},
 				"color": {
-					"text": "var(--wp--preset--color--primary)"
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"typography": {
+					"textDecoration": "none"
 				}
 			}
 		},
@@ -650,9 +665,10 @@
 			}
 		},
 		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--albert-sans)",
+			"fontFamily": "var(--wp--preset--font-family--overused-grotesk)",
 			"fontSize": "var(--wp--preset--font-size--medium)",
-			"lineHeight": "1.2"
+			"letterSpacing": "0.02rem",
+			"lineHeight": "1.5"
 		}
 	},
 	"templateParts": [