diff --git a/src/wp-content/themes/twentytwentyfour/functions.php b/src/wp-content/themes/twentytwentyfour/functions.php index 443035f384..2dbd05355d 100644 --- a/src/wp-content/themes/twentytwentyfour/functions.php +++ b/src/wp-content/themes/twentytwentyfour/functions.php @@ -32,9 +32,9 @@ if ( ! function_exists( 'twentytwentyfour_block_styles' ) ) : 'core/button', array( 'handle' => 'twentytwentyfour-button-style-outline', - 'src' => get_theme_file_uri( 'assets/css/button-outline.css' ), - 'ver' => wp_get_theme()->get( 'Version' ), - 'path' => get_theme_file_path( 'assets/css/button-outline.css' ), + 'src' => get_parent_theme_file_uri( 'assets/css/button-outline.css' ), + 'ver' => wp_get_theme( get_template() )->get( 'Version' ), + 'path' => get_parent_theme_file_path( 'assets/css/button-outline.css' ), ) ); @@ -45,7 +45,6 @@ if ( ! function_exists( 'twentytwentyfour_block_styles' ) ) : 'label' => __( 'Arrow icon', 'twentytwentyfour' ), /* * Styles for the custom Arrow icon style of the Details block - * https://github.com/WordPress/twentytwentyfour/issues/46 */ 'inline_style' => ' .is-style-arrow-icon-details { diff --git a/src/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php b/src/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php index d1c5242569..ae88e9006c 100644 --- a/src/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php +++ b/src/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php @@ -22,7 +22,7 @@ <!-- wp:column {"width":"60%"} --> <div class="wp-block-column" style="flex-basis:60%"> - <!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} --> + <!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} --> <div class="wp-block-query"> <!-- wp:post-template --> <!-- wp:group {"tagName":"article","layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} --> diff --git a/src/wp-content/themes/twentytwentyfour/patterns/page-home-business.php b/src/wp-content/themes/twentytwentyfour/patterns/page-home-business.php index fb526b25c0..ca22952174 100644 --- a/src/wp-content/themes/twentytwentyfour/patterns/page-home-business.php +++ b/src/wp-content/themes/twentytwentyfour/patterns/page-home-business.php @@ -1,7 +1,7 @@ <?php /** * Title: Business home - * Slug: twentytwentyfour/home-business + * Slug: twentytwentyfour/page-home-business * Categories: page * Keywords: starter * Block Types: core/post-content @@ -14,5 +14,5 @@ <!-- wp:pattern {"slug":"twentytwentyfour/text-feature-grid-3-col"} /--> <!-- wp:pattern {"slug":"twentytwentyfour/text-alternating-images"} /--> <!-- wp:pattern {"slug":"twentytwentyfour/testimonial-centered"} /--> -<!-- wp:pattern {"slug":"twentytwentyfour/posts-grid-2-col"} /--> +<!-- wp:pattern {"slug":"twentytwentyfour/posts-list"} /--> <!-- wp:pattern {"slug":"twentytwentyfour/cta-subscribe-centered"} /--> diff --git a/src/wp-content/themes/twentytwentyfour/patterns/posts-list.php b/src/wp-content/themes/twentytwentyfour/patterns/posts-list.php new file mode 100644 index 0000000000..5db93af229 --- /dev/null +++ b/src/wp-content/themes/twentytwentyfour/patterns/posts-list.php @@ -0,0 +1,62 @@ +<?php +/** + * Title: List of posts without images, 1 column + * Slug: twentytwentyfour/posts-list + * Categories: query, posts + * Block Types: core/query + */ +?> + +<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} --> +<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"> + <!-- wp:heading {"align":"wide","style":{"typography":{"lineHeight":"1"},"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|40"}}},"fontSize":"x-large"} --> + <h2 class="wp-block-heading alignwide has-x-large-font-size" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--40);line-height:1"><?php esc_html_e( 'Watch, Read, Listen', 'twentytwentyfour' ); ?></h2> + <!-- /wp:heading --> + + <!-- wp:group {"align":"wide","layout":{"type":"constrained"}} --> + <div class="wp-block-group alignwide"> + <!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"align":"wide","layout":{"type":"default"}} --> + <div class="wp-block-query alignwide"> + <!-- wp:post-template --> + <!-- wp:separator {"backgroundColor":"contrast-3","className":"alignwide is-style-wide"} --> + <hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background alignwide is-style-wide" /> + <!-- /wp:separator --> + + <!-- wp:columns {"verticalAlignment":"center","align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} --> + <div class="wp-block-columns alignwide are-vertically-aligned-center" style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)"> + <!-- wp:column {"verticalAlignment":"center","width":"72%"} --> + <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:72%"> + <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.1","fontSize":"1.5rem"}}} /--> + </div> + <!-- /wp:column --> + + <!-- wp:column {"verticalAlignment":"center","width":"28%"} --> + <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:28%"> + <!-- wp:template-part {"slug":"post-meta"} /--> + </div> + <!-- /wp:column --> + </div> + <!-- /wp:columns --> + <!-- /wp:post-template --> + + <!-- wp:spacer {"height":"var:preset|spacing|30"} --> + <div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div> + <!-- /wp:spacer --> + + <!-- wp:query-pagination {"paginationArrow":"arrow","layout":{"type":"flex","justifyContent":"space-between"}} --> + <!-- wp:query-pagination-previous /--> + + <!-- wp:query-pagination-numbers /--> + + <!-- wp:query-pagination-next /--> + <!-- /wp:query-pagination --> + + <!-- wp:query-no-results --> + <!-- wp:pattern {"slug":"twentytwentyfour/hidden-no-results"} /--> + <!-- /wp:query-no-results --> + </div> + <!-- /wp:query --> + </div> + <!-- /wp:group --> +</div> +<!-- /wp:group --> diff --git a/src/wp-content/themes/twentytwentyfour/patterns/template-home-business.php b/src/wp-content/themes/twentytwentyfour/patterns/template-home-business.php index e6a41b74d7..e84a5aca90 100644 --- a/src/wp-content/themes/twentytwentyfour/patterns/template-home-business.php +++ b/src/wp-content/themes/twentytwentyfour/patterns/template-home-business.php @@ -1,8 +1,8 @@ <?php /** * Title: Business home template - * Slug: twentytwentyfour/template-home - * Template Types: front-page, index, home + * Slug: twentytwentyfour/template-home-business + * Template Types: front-page, home * Viewport width: 1400 * Inserter: no */ @@ -12,7 +12,7 @@ <!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0","margin":{"top":"0"}}},"layout":{"type":"default"}} --> <main class="wp-block-group" style="margin-top:0"> - <!-- wp:pattern {"slug":"twentytwentyfour/home-business"} /--> + <!-- wp:pattern {"slug":"twentytwentyfour/page-home-business"} /--> </main> <!-- /wp:group --> diff --git a/src/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php b/src/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php index 23e4503226..4fc4f072ba 100644 --- a/src/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php +++ b/src/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php @@ -2,7 +2,7 @@ /** * Title: Portfolio home template with post featured images * Slug: twentytwentyfour/template-home-portfolio - * Template Types: front-page, index, home + * Template Types: front-page, home * Viewport width: 1400 * Inserter: no */ diff --git a/src/wp-content/themes/twentytwentyfour/templates/home.html b/src/wp-content/themes/twentytwentyfour/templates/home.html index 92c4c041a5..7c364b8558 100644 --- a/src/wp-content/themes/twentytwentyfour/templates/home.html +++ b/src/wp-content/themes/twentytwentyfour/templates/home.html @@ -1 +1 @@ -<!-- wp:pattern {"slug":"twentytwentyfour/template-home"} /--> +<!-- wp:pattern {"slug":"twentytwentyfour/template-home-business"} /-->