Skip to content

Commit 7078dfb

Browse files
committed
Bundled Themes: Update Twenty Twenty-Five for 6.7 RC 2.
This merges the latest improvements to the Twenty Twenty-Five theme from GitHub into WordPress-Develop for 6.7 RC 2 A full list of changes can be found on GitHub: [WordPress/twentytwentyfive@7dfa99f...b5b0475 WordPress/twentytwentyfive@7dfa99f1...b5b0475f]. Props juanfra, poena. See #62310. git-svn-id: https://develop.svn.wordpress.org/trunk@59314 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 6bc26d5 commit 7078dfb

File tree

87 files changed

+1953
-1031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1953
-1031
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/wp-content/themes/twentytwentyfive/patterns/banner-poster.php

+16-9
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,23 @@
1818
<div class="wp-block-group alignwide" style="min-height:100vh">
1919
<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50"}}}} -->
2020
<div class="wp-block-columns alignwide">
21-
<!-- wp:column {"width":"66.66%"} -->
22-
<div class="wp-block-column" style="flex-basis:66.66%">
21+
<!-- wp:column {"width":"80%"} -->
22+
<div class="wp-block-column" style="flex-basis:80%">
2323
<!-- wp:heading {"textAlign":"left","align":"wide","style":{"typography":{"fontSize":"12vw","lineHeight":"0.9","fontStyle":"normal","fontWeight":"300"}}} -->
24-
<h2 class="wp-block-heading alignwide has-text-align-left" style="font-size:12vw;font-style:normal;font-weight:300;line-height:0.9"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Sample heading in four languages.', 'twentytwentyfive' ); ?></h2>
24+
<h2 class="wp-block-heading alignwide has-text-align-left" style="font-size:12vw;font-style:normal;font-weight:300;line-height:0.9">
25+
<?php
26+
echo wp_kses_post(
27+
/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
28+
_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
29+
);
30+
?>
31+
</h2>
2532
<!-- /wp:heading -->
2633
</div>
2734
<!-- /wp:column -->
2835

29-
<!-- wp:column {"width":"33.33%"} -->
30-
<div class="wp-block-column" style="flex-basis:33.33%">
36+
<!-- wp:column {"width":"20%"} -->
37+
<div class="wp-block-column" style="flex-basis:20%">
3138
<!-- wp:paragraph {"align":"right"} -->
3239
<p class="has-text-align-right"><?php echo esc_html_x( 'Aug 08—10 2025', 'Example event date in pattern.', 'twentytwentyfive' ); ?><br><?php esc_html_e( 'Fuego Bar, Mexico City', 'twentytwentyfive' ); ?></p>
3340
<!-- /wp:paragraph -->
@@ -38,16 +45,16 @@
3845

3946
<!-- wp:columns {"verticalAlignment":"bottom","isStackedOnMobile":false,"align":"wide"} -->
4047
<div class="wp-block-columns alignwide are-vertically-aligned-bottom is-not-stacked-on-mobile">
41-
<!-- wp:column {"verticalAlignment":"bottom","width":"66.66%"} -->
42-
<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:66.66%">
48+
<!-- wp:column {"verticalAlignment":"bottom","width":"80%"} -->
49+
<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:80%">
4350
<!-- wp:heading {"textAlign":"left","align":"wide","style":{"typography":{"lineHeight":"0.9","fontStyle":"normal","fontWeight":"300"}},"fontSize":"xx-large"} -->
4451
<h2 class="wp-block-heading alignwide has-text-align-left has-xx-large-font-size" style="font-style:normal;font-weight:300;line-height:0.9"><?php esc_html_e( 'Let’s hear them.', 'twentytwentyfive' ); ?></h2>
4552
<!-- /wp:heading -->
4653
</div>
4754
<!-- /wp:column -->
4855

49-
<!-- wp:column {"verticalAlignment":"bottom","width":"33.33%"} -->
50-
<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:33.33%">
56+
<!-- wp:column {"verticalAlignment":"bottom","width":"20%"} -->
57+
<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:20%">
5158
<!-- wp:paragraph {"align":"right"} -->
5259
<p class="has-text-align-right"><?php esc_html_e( '#stories', 'twentytwentyfive' ); ?></p>
5360
<!-- /wp:paragraph -->

src/wp-content/themes/twentytwentyfive/patterns/cta-events-list.php

+16-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,14 @@
6161
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--accent-6);border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:group {"layout":{"type":"constrained"}} -->
6262
<div class="wp-block-group">
6363
<!-- wp:heading {"level":3} -->
64-
<h3 class="wp-block-heading"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h3>
64+
<h3 class="wp-block-heading">
65+
<?php
66+
echo wp_kses_post(
67+
/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
68+
_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
69+
);
70+
?>
71+
</h3>
6572
<!-- /wp:heading -->
6673

6774
<!-- wp:paragraph -->
@@ -123,7 +130,14 @@
123130
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--accent-6);border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:group {"layout":{"type":"constrained"}} -->
124131
<div class="wp-block-group">
125132
<!-- wp:heading {"level":3} -->
126-
<h3 class="wp-block-heading"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h3>
133+
<h3 class="wp-block-heading">
134+
<?php
135+
echo wp_kses_post(
136+
/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
137+
_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
138+
);
139+
?>
140+
</h3>
127141
<!-- /wp:heading -->
128142

129143
<!-- wp:paragraph -->

src/wp-content/themes/twentytwentyfive/patterns/cta-grid-products-link.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
1717
<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
1818
<div class="wp-block-group alignwide">
19-
<!-- wp:heading {"style":{"typography":{"fontSize":"11.58rem","letterSpacing":"-0.02em"}}} -->
20-
<h2 class="wp-block-heading" style="font-size:11.58rem;letter-spacing:-0.02em"><?php esc_html_e( 'Our online store.', 'twentytwentyfive' ); ?></h2>
19+
<!-- wp:heading {"style":{"typography":{"fontSize":"9.6rem","letterSpacing":"-0.02em"}}} -->
20+
<h2 class="wp-block-heading" style="font-size:9.6rem;letter-spacing:-0.02em"><?php esc_html_e( 'Our online store.', 'twentytwentyfive' ); ?></h2>
2121
<!-- /wp:heading -->
2222

2323
<!-- wp:group {"layout":{"type":"grid","columnCount":null,"minimumColumnWidth":"10rem"}} -->

src/wp-content/themes/twentytwentyfive/patterns/event-rsvp.php

+58-33
Original file line numberDiff line numberDiff line change
@@ -14,65 +14,90 @@
1414
*/
1515

1616
?>
17-
<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
18-
<div class="wp-block-group alignfull">
19-
<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"grid","minimumColumnWidth":"70rem"}} -->
20-
<div class="wp-block-group alignfull">
21-
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|80","left":"var:preset|spacing|40","right":"var:preset|spacing|40","top":"var:preset|spacing|40"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
22-
<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--40)">
17+
<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0","margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"}} -->
18+
<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
19+
<!-- wp:columns {"isStackedOnMobile":false,"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|80","left":"var:preset|spacing|40","right":"var:preset|spacing|40"},"margin":{"top":"0","bottom":"0"}}}} -->
20+
<div class="wp-block-columns alignfull is-not-stacked-on-mobile" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--40)">
21+
<!-- wp:column {"width":"66.66%"} -->
22+
<div class="wp-block-column" style="flex-basis:66.66%">
2323
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
2424
<div class="wp-block-group">
2525
<!-- wp:heading {"fontSize":"xx-large"} -->
26-
<h2 class="wp-block-heading has-xx-large-font-size"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h2>
26+
<h2 class="wp-block-heading has-xx-large-font-size">
27+
<?php
28+
echo wp_kses_post(
29+
/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
30+
_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
31+
);
32+
?>
33+
</h2>
2734
<!-- /wp:heading -->
2835

2936
<!-- wp:paragraph {"fontSize":"x-large"} -->
3037
<p class="has-x-large-font-size"><?php echo esc_html_x( 'Mon, Jan 1', 'Example event date in pattern.', 'twentytwentyfive' ); ?></p>
3138
<!-- /wp:paragraph -->
3239

33-
<!-- wp:spacer {"height":"0px","style":{"layout":{"selfStretch":"fixed","flexSize":"100px"}}} -->
40+
<!-- wp:spacer {"height":"0px","style":{"layout":{"selfStretch":"fixed","flexSize":"140px"}}} -->
3441
<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
3542
<!-- /wp:spacer -->
3643
</div>
3744
<!-- /wp:group -->
45+
</div>
46+
<!-- /wp:column -->
47+
48+
<!-- wp:column {"width":"12vw"} -->
49+
<div class="wp-block-column" style="flex-basis:12vw"></div>
50+
<!-- /wp:column -->
3851

39-
<!-- wp:paragraph {"align":"left","style":{"typography":{"writingMode":"vertical-rl","textTransform":"uppercase","lineHeight":"0.6"}}} -->
40-
<p class="has-text-align-left" style="line-height:0.6;text-transform:uppercase;writing-mode:vertical-rl"><?php esc_html_e( 'Free WorKshop', 'twentytwentyfive' ); ?></p>
41-
<!-- /wp:paragraph -->
52+
<!-- wp:column -->
53+
<div class="wp-block-column">
54+
<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
55+
<div class="wp-block-group">
56+
<!-- wp:paragraph {"align":"left","style":{"typography":{"writingMode":"vertical-rl","textTransform":"uppercase","lineHeight":"0.6"}}} -->
57+
<p class="has-text-align-left" style="line-height:0.6;text-transform:uppercase;writing-mode:vertical-rl"><?php esc_html_e( 'Free Workshop', 'twentytwentyfive' ); ?></p>
58+
<!-- /wp:paragraph -->
59+
</div>
60+
<!-- /wp:group -->
4261
</div>
43-
<!-- /wp:group -->
62+
<!-- /wp:column -->
4463
</div>
45-
<!-- /wp:group -->
64+
<!-- /wp:columns -->
4665

47-
<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"grid","minimumColumnWidth":"40rem","columnCount":null}} -->
48-
<div class="wp-block-group alignfull">
49-
<!-- wp:group {"className":"is-style-section-2","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30","left":"var:preset|spacing|40","right":"var:preset|spacing|40"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
50-
<div class="wp-block-group is-style-section-2" style="padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--40)">
51-
<!-- wp:paragraph -->
52-
<p><?php esc_html_e( 'This immersive event celebrates the universal human experience through the lenses of history and ancestry, featuring a diverse array of photographers whose works capture the essence of different cultures and historical moments.', 'twentytwentyfive' ); ?></p>
53-
<!-- /wp:paragraph -->
66+
<!-- wp:columns {"align":"full","className":"is-style-section-2","style":{"spacing":{"blockGap":{"top":"0","left":"0"},"padding":{"top":"0","bottom":"0"}}}} -->
67+
<div class="wp-block-columns alignfull is-style-section-2" style="padding-top:0;padding-bottom:0">
68+
<!-- wp:column {"width":"50%"} -->
69+
<div class="wp-block-column" style="flex-basis:50%">
70+
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}},"dimensions":{"minHeight":"33vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
71+
<div class="wp-block-group" style="min-height:33vh;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)">
72+
<!-- wp:paragraph -->
73+
<p><?php esc_html_e( 'This immersive event celebrates the universal human experience through the lenses of history and ancestry, featuring a diverse array of photographers whose works capture the essence of different cultures and historical moments.', 'twentytwentyfive' ); ?></p>
74+
<!-- /wp:paragraph -->
5475

55-
<!-- wp:spacer {"height":"0px","style":{"layout":{"selfStretch":"fixed","flexSize":"100px"}}} -->
56-
<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
57-
<!-- /wp:spacer -->
76+
<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"100px","selfStretch":"fixed"}}} -->
77+
<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
78+
<!-- /wp:spacer -->
5879

59-
<!-- wp:heading {"fontSize":"xx-large"} -->
60-
<h2 class="wp-block-heading has-xx-large-font-size"><a href="#"><?php echo esc_html_x( 'RSVP', 'Abbreviation for "Please respond".', 'twentytwentyfive' ); ?></a></h2>
61-
<!-- /wp:heading -->
80+
<!-- wp:heading {"fontSize":"xx-large"} -->
81+
<h2 class="wp-block-heading has-xx-large-font-size"><a href="#"><?php echo esc_html_x( 'RSVP', 'Abbreviation for "Please respond".', 'twentytwentyfive' ); ?></a></h2>
82+
<!-- /wp:heading -->
83+
</div>
84+
<!-- /wp:group -->
6285
</div>
63-
<!-- /wp:group -->
86+
<!-- /wp:column -->
6487

65-
<!-- wp:cover {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/botany-flowers-closeup.webp","dimRatio":0,"overlayColor":"base","isUserOverlayColor":true,"isDark":false,"layout":{"type":"constrained"}} -->
66-
<div class="wp-block-cover is-light">
67-
<span aria-hidden="true" class="wp-block-cover__background has-base-background-color has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="<?php esc_attr_e( 'Close up photo of white flowers on a grey background', 'twentytwentyfive' ); ?>" src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/botany-flowers-closeup.webp" data-object-fit="cover"/>
88+
<!-- wp:column {"width":"50%"} -->
89+
<div class="wp-block-column" style="flex-basis:50%">
90+
<!-- wp:cover {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/botany-flowers-closeup.webp","dimRatio":0,"isDark":false} -->
91+
<div class="wp-block-cover is-light"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="<?php esc_attr_e( 'Close up photo of white flowers on a grey background', 'twentytwentyfive' ); ?>" src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/botany-flowers-closeup.webp" data-object-fit="cover"/>
6892
<div class="wp-block-cover__inner-container">
6993
<!-- wp:spacer {"height":"var:preset|spacing|20"} -->
7094
<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
7195
<!-- /wp:spacer -->
72-
</div>
96+
</div></div>
97+
<!-- /wp:cover -->
7398
</div>
74-
<!-- /wp:cover -->
99+
<!-- /wp:column -->
75100
</div>
76-
<!-- /wp:group -->
101+
<!-- /wp:columns -->
77102
</div>
78103
<!-- /wp:group -->

src/wp-content/themes/twentytwentyfive/patterns/hidden-written-by.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
*/
1111

1212
?>
13-
<!-- wp:group {"style":{"spacing":{"blockGap":"0.2em","margin":{"bottom":"var:preset|spacing|60"}}},"textColor":"accent-4","fontSize":"small","layout":{"type":"flex","flexWrap":"nowrap"}} -->
13+
<!-- wp:group {"style":{"spacing":{"blockGap":"0.2em","margin":{"bottom":"var:preset|spacing|60"}}},"textColor":"accent-4","fontSize":"small","layout":{"type":"flex","flexWrap":"wrap"}} -->
1414
<div class="wp-block-group has-accent-4-color has-text-color has-link-color has-small-font-size" style="margin-bottom:var(--wp--preset--spacing--60)">
1515
<!-- wp:paragraph -->
1616
<p><?php esc_html_e( 'Written by ', 'twentytwentyfive' ); ?></p>
1717
<!-- /wp:paragraph -->
18-
<!-- wp:post-author-name {"isLink":true,"style":{"typography":{"textDecoration":"underline"}}} /-->
18+
<!-- wp:post-author-name {"isLink":true} /-->
1919
<!-- wp:paragraph -->
2020
<p><?php esc_html_e( 'in', 'twentytwentyfive' ); ?></p>
2121
<!-- /wp:paragraph -->
22-
<!-- wp:post-terms {"term":"category","style":{"typography":{"fontWeight":"300","textDecoration":"underline"}}} /-->
22+
<!-- wp:post-terms {"term":"category","style":{"typography":{"fontWeight":"300"}}} /-->
2323
</div>
2424
<!-- /wp:group -->

src/wp-content/themes/twentytwentyfive/patterns/template-single-left-aligned-content.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- wp:paragraph -->
3131
<p><?php echo esc_html_x( 'by', 'Prefix before the author name. The post author name is displayed in a separate block.', 'twentytwentyfive' ); ?></p>
3232
<!-- /wp:paragraph -->
33-
<!-- wp:post-author-name {"isLink":true,"style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /-->
33+
<!-- wp:post-author-name {"isLink":true,"fontSize":"small"} /-->
3434
</div>
3535
<!-- /wp:group -->
3636
</div>

src/wp-content/themes/twentytwentyfive/style.css

+15
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,21 @@ a {
2929
outline-style: solid;
3030
}
3131

32+
/* Increase the bottom margin on submenus, so that the outline is visible. */
33+
.wp-block-navigation .wp-block-navigation-submenu .wp-block-navigation-item:not(:last-child) {
34+
margin-bottom: 3px;
35+
}
36+
37+
/* Increase the outline offset on the parent menu items, so that the outline does not touch the text. */
38+
.wp-block-navigation .wp-block-navigation-item .wp-block-navigation-item__content {
39+
outline-offset: 4px;
40+
}
41+
42+
/* Remove outline offset from the submenus, otherwise the outline is visible outside the submenu container. */
43+
.wp-block-navigation .wp-block-navigation-item ul.wp-block-navigation__submenu-container .wp-block-navigation-item__content {
44+
outline-offset: 0;
45+
}
46+
3247
/*
3348
* Progressive enhancement to reduce widows and orphans
3449
* https://github.com/WordPress/gutenberg/issues/55190

0 commit comments

Comments
 (0)