Skip to content

Commit

Permalink
Bundled Themes: Update Twenty Twenty-Five for 6.7 RC 3.
Browse files Browse the repository at this point in the history 
This merges the latest improvements to the Twenty Twenty-Five theme from GitHub into WordPress-Develop for 6.7 RC 3.

A full list of changes can be found on GitHub: WordPress/twentytwentyfive@b6f4ee2...b5b0475.

Props juanfra.
See #62343.

git-svn-id: https://develop.svn.wordpress.org/trunk@59348 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
@desrosj
desrosj committed Nov 5, 2024
1 parent 83a4492 commit 4c818a2
Show file tree
Hide file tree
Showing 36 changed files with 625 additions and 248 deletions.
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function twentytwentyfive_pattern_categories() {
register_block_pattern_category(
'twentytwentyfive_post-format',
array(
'label' => __( 'Post format', 'twentytwentyfive' ),
'label' => __( 'Post formats', 'twentytwentyfive' ),
'description' => __( 'A collection of post format patterns.', 'twentytwentyfive' ),
)
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/cta-heading-search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<h2 class="wp-block-heading has-xx-large-font-size"><?php esc_html_e( 'What are you looking for?', 'twentytwentyfive' ); ?></h2>
<!-- /wp:heading -->

<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'Search form label.', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type here...', 'Search input field placeholder text.', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'Button text. Verb', 'twentytwentyfive' ); ?>"} /-->
<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'Search form label.', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type here...', 'Search input field placeholder text.', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'Button text. Verb.', 'twentytwentyfive' ); ?>"} /-->
</div>
<!-- /wp:group -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/wp-content/themes/twentytwentyfive/patterns/event-schedule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<!-- wp:column {"width":"33.33%"} -->
<div class="wp-block-column" style="flex-basis:33.33%">
<!-- wp:image {"id":2773,"aspectRatio":"1","scale":"cover","sizeSlug":"full","linkDestination":"none","style":{"layout":{"selfStretch":"fixed","flexSize":"270px"}}} -->
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/parthenon-square.webp" alt="<?php esc_attr_e( 'The acropolis in Athens.', 'twentytwentyfive' ); ?>" class="wp-image-2773" style="aspect-ratio:1;object-fit:cover"/></figure>
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/parthenon-square.webp" alt="<?php esc_attr_e( 'The Acropolis of Athens.', 'twentytwentyfive' ); ?>" class="wp-image-2773" style="aspect-ratio:1;object-fit:cover"/></figure>
<!-- /wp:image -->
</div>
<!-- /wp:column -->
Expand Down Expand Up @@ -160,7 +160,7 @@
<!-- wp:column {"width":"33.33%"} -->
<div class="wp-block-column" style="flex-basis:33.33%">
<!-- wp:image {"id":2774,"aspectRatio":"1","scale":"cover","sizeSlug":"full","linkDestination":"none","style":{"layout":{"selfStretch":"fixed","flexSize":"270px"}}} -->
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/agenda-img-4.webp" alt="<?php esc_attr_e( 'Black and white photo of an african woman.', 'twentytwentyfive' ); ?>" class="wp-image-2774" style="aspect-ratio:1;object-fit:cover"/></figure>
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/agenda-img-4.webp" alt="<?php esc_attr_e( 'Black and white photo of an African woman.', 'twentytwentyfive' ); ?>" class="wp-image-2774" style="aspect-ratio:1;object-fit:cover"/></figure>
<!-- /wp:image -->
</div>
<!-- /wp:column -->
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/footer-centered.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<p class="has-text-align-center has-small-font-size">
<?php
printf(
/* Translators: Designed with WordPress. %s: WordPress link. */
/* translators: Designed with WordPress. %s: WordPress link. */
esc_html__( 'Designed with %s', 'twentytwentyfive' ),
'<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfive' ) ) . '" rel="nofollow">WordPress</a>'
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/footer-columns.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<p class="has-small-font-size">
<?php
printf(
/* Translators: Designed with WordPress. %s: WordPress link. */
/* translators: Designed with WordPress. %s: WordPress link. */
esc_html__( 'Designed with %s', 'twentytwentyfive' ),
'<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfive' ) ) . '" rel="nofollow">WordPress</a>'
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/footer-newsletter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<p class="has-small-font-size">
<?php
printf(
/* Translators: Designed with WordPress. %s: WordPress link. */
/* translators: Designed with WordPress. %s: WordPress link. */
esc_html__( 'Designed with %s', 'twentytwentyfive' ),
'<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfive' ) ) . '" rel="nofollow">WordPress</a>'
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/footer-social.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<p class="has-text-align-center has-small-font-size">
<?php
printf(
/* Translators: Designed with WordPress. %s: WordPress link. */
/* translators: Designed with WordPress. %s: WordPress link. */
esc_html__( 'Designed with %s', 'twentytwentyfive' ),
'<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfive' ) ) . '" rel="nofollow">WordPress</a>'
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<p class="has-small-font-size">
<?php
printf(
/* Translators: Designed with WordPress. %s: WordPress link. */
/* translators: Designed with WordPress. %s: WordPress link. */
esc_html__( 'Designed with %s', 'twentytwentyfive' ),
'<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfive' ) ) . '" rel="nofollow">WordPress</a>'
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/hero-podcast.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap"}} -->
<div class="wp-block-group">
<!-- wp:paragraph {"className":"is-style-text-annotation"} -->
<p class="is-style-text-annotation"><a href="#"><?php echo esc_html_x( 'Youtube', 'Button text', 'twentytwentyfive' ); ?></a></p>
<p class="is-style-text-annotation"><a href="#"><?php echo esc_html_x( 'YouTube', 'Button text', 'twentytwentyfive' ); ?></a></p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"className":"is-style-text-annotation"} -->
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/hidden-search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@

?>

<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'Search form label.', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type here...', 'Search input field placeholder text', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'Button text. Verb.', 'twentytwentyfive' ); ?>"} /-->
<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'Search form label.', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type here...', 'Search input field placeholder text.', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'Button text. Verb.', 'twentytwentyfive' ); ?>"} /-->
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/media-instagram-grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<!-- /wp:image -->

<!-- wp:image {"aspectRatio":"1","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/parthenon-square.webp" alt="<?php esc_attr_e( 'The acropolis in Athens.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/></figure>
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/parthenon-square.webp" alt="<?php esc_attr_e( 'The Acropolis of Athens.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/></figure>
<!-- /wp:image -->

<!-- wp:image {"aspectRatio":"1","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/services-subscriber-only-section.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<!-- /wp:list-item -->

<!-- wp:list-item {"fontSize":"medium"} -->
<li class="has-medium-font-size"><?php esc_html_e( 'Join our IRL event.', 'twentytwentyfive' ); ?></li>
<li class="has-medium-font-size"><?php esc_html_e( 'Join our IRL events.', 'twentytwentyfive' ); ?></li>
<!-- /wp:list-item -->

<!-- wp:list-item {"fontSize":"medium"} -->
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/template-home-with-sidebar-news-blog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<div class="wp-block-group has-small-font-size">
<!-- wp:post-terms {"term":"category","style":{"typography":{"textTransform":"uppercase","letterSpacing":"1.4px"}}} /-->
<!-- wp:paragraph -->
<p><?php echo esc_html_x( '·', 'Separator between date and categories', 'twentytwentyfive' ); ?></p>
<p><?php echo esc_html_x( '·', 'Separator between date and categories.', 'twentytwentyfive' ); ?></p>
<!-- /wp:paragraph -->
<!-- wp:post-date {"isLink":true} /-->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/template-query-loop-vertical-header-blog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<!-- wp:query-no-results -->
<!-- wp:paragraph -->
<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search', 'twentytwentyfive' ); ?></p>
<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
<!-- /wp:paragraph -->
<!-- /wp:query-no-results -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/patterns/template-query-loop.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
<!-- wp:query-no-results -->
<!-- wp:paragraph -->
<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search', 'twentytwentyfive' ); ?></p>
<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
<!-- /wp:paragraph -->
<!-- /wp:query-no-results -->
</div>
Expand Down
Loading

0 comments on commit 4c818a2

Please sign in to comment.