Update front page content layout

Closes #2

source/wp-content/themes/wporg-make-2024/functions.php

@@ -6,7 +6,6 @@
  * Blocks.
  */
 require_once __DIR__ . '/src/meeting-time/index.php';
-require_once __DIR__ . '/inc/block-hooks.php';
 
 /**
  * Actions and filters.

source/wp-content/themes/wporg-make-2024/parts/card-team.html

@@ -1,17 +1,29 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20","left":"var:preset|spacing|20","right":"var:preset|spacing|20"}},"border":{"width":"1px"},"dimensions":{"minHeight":"100%"}},"borderColor":"light-grey-1","layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-<div class="wp-block-group has-border-color has-light-grey-1-border-color" style="border-width:1px;min-height:100%;padding-top:var(--wp--preset--spacing--20);padding-right:var(--wp--preset--spacing--20);padding-bottom:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--20)">
+<!-- wp:columns {"style":{"border":{"bottom":{"color":"var:preset|color|light-grey-1","width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"},"blockGap":{"left":"40px"}}}} -->
+<div class="wp-block-columns" style="border-bottom-color:var(--wp--preset--color--light-grey-1);border-bottom-width:1px;padding-top:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--30)">
+
+	<!-- wp:column {"width":"19%"} -->
+	<div class="wp-block-column" style="flex-basis:19%">
 
-	<!-- wp:group {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
+		<!-- wp:post-title {"level":3,"isLink":true,"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"typography":{"fontStyle":"normal","fontWeight":"600"},"elements":{"link":{"color":{"text":"var:preset|color|blueberry-1"}}}},"textColor":"blueberry-1","fontSize":"heading-6","fontFamily":"inter"} /-->
 
-		<!-- wp:post-title {"level":3,"isLink":true,"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|charcoal-1"}}},"typography":{"fontSize":"22px","lineHeight":"1.8"}}} /-->
+	</div>
+	<!-- /wp:column -->
+
+	<!-- wp:column -->
+	<div class="wp-block-column">
 
-		<!-- wp:post-content {"style":{"typography":{"lineHeight":"1.7"}},"fontSize":"small"} /-->
+		<!-- wp:post-content {"fontSize":"small"} /-->
 
 	</div>
-	<!-- /wp:group -->
+	<!-- /wp:column -->
+
+	<!-- wp:column {"width":"36%"} -->
+	<div class="wp-block-column" style="flex-basis:36%">
 
-	<!-- wp:wporg-make/meeting-time {"fontSize":"extra-small"} /-->
+		<!-- wp:wporg-make/meeting-time {"fontSize":"extra-small"} /-->
 
+	</div>
+	<!-- /wp:column -->
+
 </div>
-<!-- /wp:group -->
+<!-- /wp:columns -->

source/wp-content/themes/wporg-make-2024/parts/footer.html

@@ -1,3 +1 @@
-<!-- wp:pattern {"slug":"wporg-make-2024/footer-content"} /-->
-
 <!-- wp:wporg/global-footer {"tagName":"div"} /-->

source/wp-content/themes/wporg-make-2024/patterns/front-page-content.php

@@ -7,37 +7,14 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|30"}}},"layout":{"type":"constrained","justifyContent":"left","contentSize":"774px"}} -->
-<div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--30)">
-
-	<!-- wp:heading {"style":{"spacing":{"margin":{"top":"0"}}}} -->
-	<h2 class="wp-block-heading" style="margin-top:0"><?php esc_html_e( 'Teams', 'make-wporg' ); ?></h2>
-	<!-- /wp:heading -->
-
-	<!-- wp:wporg/notice {"type":"info"} -->
-	<div class="wp-block-wporg-notice is-info-notice">
-		<div class="wp-block-wporg-notice__icon"></div>
-		<div class="wp-block-wporg-notice__content">
-			<p>
-			<?php echo wp_kses_post(
-				sprintf(
-					/* translators: 1: Contributor wizard link */
-					__( 'Not sure which contributor teams match your interests and abilities? Check out our <a href="%s">contributor wizard</a>.', 'make-wporg' ),
-					'https://make.wordpress.org/contribute/',
-				)
-			); ?>
-			</p>
-		</div>
-	</div>
-	<!-- /wp:wporg/notice -->
+<!-- wp:heading {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|30"}}}} -->
+<h2 class="wp-block-heading" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--30)"><?php esc_html_e( 'Teams', 'make-wporg' ); ?></h2>
+<!-- /wp:heading -->
 
-</div>
-<!-- /wp:group -->
-
-<!-- wp:query {"queryId":0,"query":{"perPage":100,"postType":"make_site","order":"asc","orderBy":"date"},"align":"wide","className":"wporg-make-team-grid"} -->
-<div class="wp-block-query alignwide wporg-make-team-grid">
-
-	<!-- wp:post-template {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"grid","columnCount":3}} -->
+<!-- wp:query {"queryId":0,"query":{"perPage":100,"postType":"make_site","order":"asc","orderBy":"date"},"align":"wide","className":"wporg-make-team-list"} -->
+<div class="wp-block-query alignwide wporg-make-team-list">
+
+	<!-- wp:post-template {"style":{"spacing":{"blockGap":"0"}},"fontSize":"extra-small","layout":{"type":"default"}} -->
 
 		<!-- wp:template-part {"slug":"card-team","className":"has-display-contents"} /-->
 
@@ -51,3 +28,45 @@
 
 </div>
 <!-- /wp:query -->
+
+<!-- wp:heading {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"margin":{"top":"var:preset|spacing|50"}}},"fontSize":"heading-1","fontFamily":"eb-garamond"} -->
+<h2 class="wp-block-heading has-eb-garamond-font-family has-heading-1-font-size" style="margin-top:var(--wp--preset--spacing--50);font-style:normal;font-weight:400"><?php esc_html_e( 'Not sure which team to contribute to?', 'make-wporg' ); ?></h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>
+<?php echo wp_kses_post(
+	sprintf(
+		/* translators: 1: Contributor wizard link */
+		__( 'Check out our <a href="%s">contributor wizard</a> and find how to get started.', 'make-wporg' ),
+		'https://make.wordpress.org/contribute/',
+	)
+); ?>
+</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","right":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|50","left":"var:preset|spacing|edge-space"},"margin":{"top":"var:preset|spacing|50"}},"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"blueberry-1","textColor":"white","layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-white-color has-blueberry-1-background-color has-text-color has-background has-link-color" style="margin-top:var(--wp--preset--spacing--50);padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--edge-space)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|edge-space"}}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"verticalAlignment":"center","width":"55%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:55%"><!-- wp:heading {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"textColor":"white","fontSize":"heading-1","fontFamily":"eb-garamond"} -->
+<h2 class="wp-block-heading has-white-color has-text-color has-link-color has-eb-garamond-font-family has-heading-1-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e( 'Shape the future of WordPress', 'make-wporg' ); ?></h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"className":"is-style-short-text"} -->
+<p class="is-style-short-text"><?php esc_html_e( 'Become a Five for the Future participant.', 'make-wporg' ); ?></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"verticalAlignment":"center"} -->
+<div class="wp-block-column is-vertically-aligned-center"><!-- wp:list {"className":"is-style-links-list"} -->
+<ul class="wp-block-list is-style-links-list"><!-- wp:list-item {"fontSize":"large"} -->
+<li class="has-large-font-size"><a href="https://wordpress.org/five-for-the-future/for-organizations/" data-type="page" data-id="9"><?php esc_html_e( 'Contribute as an organization', 'make-wporg' ); ?></a></li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item {"fontSize":"large"} -->
+<li class="has-large-font-size"><a href="https://wordpress.org/five-for-the-future/for-individuals/" data-type="page" data-id="8"><?php esc_html_e( 'Contribute as an individual', 'make-wporg' ); ?></a></li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->

source/wp-content/themes/wporg-make-2024/src/meeting-time/block.json

@@ -33,5 +33,6 @@
 		}
 	},
 	"textdomain": "make-wporg",
-	"editorScript": "file:./index.js"
+	"editorScript": "file:./index.js",
+	"viewStyle": "file:./style-index.css"
 }

source/wp-content/themes/wporg-make-2024/src/meeting-time/index.js

@@ -8,6 +8,7 @@ import { registerBlockType } from '@wordpress/blocks';
  */
 import Edit from '../shared/dynamic-edit';
 import metadata from './block.json';
+import './style.scss';
 
 registerBlockType( metadata.name, {
 	/**

source/wp-content/themes/wporg-make-2024/src/meeting-time/style.scss

@@ -0,0 +1,6 @@
+.wp-block-wporg-make-meeting-time {
+	p {
+		margin-block-start: 0;
+		margin-block-end: 0;
+	}
+}