WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
10/07/2024 06:07:57 PM (13 months ago)
Author:
desrosj
Message:

Twenty Twenty-Five: Merge the latest improvements for Beta 2.

This merges the latest improvements to the Twenty Twenty-Five theme from GitHub into trunk for 6.7 beta 2.

A full list of changes can be found on GitHub: ​https://github.com/WordPress/twentytwentyfive/commits/trunk/?since=2024-10-01&until=2024-10-07.

Props poena, mukesh27, jonnywatersbb, cliffralessio, afercia, samtoohey93, codersantosh, carstenbach, gohelkunjan, ryelle, aaronrobertshaw, wildworks, yukinobu, audrasjb, mdviralsampat, hanneslsm, ddewan, greenshady, joedolson, areziaal, alaminfirdows, kartikmehta, cwhitmore.
Fixes #62180.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-content/themes/twentytwentyfive/patterns/pricing-3-col.php

    r59146 r59191  
    1717    <div class="wp-block-group alignwide">
    1818        <!-- wp:heading {"fontSize":"x-large"} -->
    19         <h2 class="wp-block-heading has-x-large-font-size">Choose your membership</h2>
     19        <h2 class="wp-block-heading has-x-large-font-size"><?php esc_html_e( 'Choose your membership', 'twentytwentyfive' ); ?></h2>
    2020        <!-- /wp:heading -->
    2121
    2222        <!-- wp:paragraph {"className":"is-style-text-annotation"} -->
    23         <p class="is-style-text-annotation">Pricing</p>
     23        <p class="is-style-text-annotation"><?php esc_html_e( 'Pricing', 'twentytwentyfive' ); ?></p>
    2424        <!-- /wp:paragraph -->
    2525    </div>
    … …  
    3535                <div class="wp-block-column" style="flex-basis:70%">
    3636                    <!-- wp:heading {"level":3,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}},"fontSize":"large"} -->
    37                     <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)">Free</h3>
     37                    <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)"><?php esc_html_e( 'Free', 'twentytwentyfive' ); ?></h3>
    3838                    <!-- /wp:heading -->
    3939
    4040                    <!-- wp:paragraph {"fontSize":"small"} -->
    41                     <p class="has-small-font-size">Get access to our free articles and weekly newsletter.</p>
     41                    <p class="has-small-font-size"><?php esc_html_e( 'Get access to our free articles and weekly newsletter.', 'twentytwentyfive' ); ?></p>
    4242                    <!-- /wp:paragraph -->
    4343                </div>
    … …  
    4747                <div class="wp-block-column" style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0">
    4848                    <!-- wp:heading {"textAlign":"right","level":3,"style":{"typography":{"textDecoration":"line-through"}}} -->
    49                     <h3 class="wp-block-heading has-text-align-right" style="text-decoration:line-through">0€</h3>
     49                    <h3 class="wp-block-heading has-text-align-right" style="text-decoration:line-through"><?php esc_html_e( '0€', 'twentytwentyfive' ); ?></h3>
    5050                    <!-- /wp:heading -->
    5151                </div>
    … …  
    5757            <div class="wp-block-buttons" style="margin-top:var(--wp--preset--spacing--30)">
    5858                <!-- wp:button {"width":100,"style":{"typography":{"lineHeight":"1.2","letterSpacing":"0.08px"}}} -->
    59                 <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button" rel="#">Join</a></div>
     59                <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Join', 'Button text, refers to joining a community. Verb.', 'twentytwentyfive' ); ?></a></div>
    6060                <!-- /wp:button -->
    6161            </div>
    … …  
    7171                <div class="wp-block-column" style="flex-basis:70%">
    7272                    <!-- wp:heading {"level":3,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}},"fontSize":"large"} -->
    73                     <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)">Single</h3>
     73                    <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html_x( 'Single', 'Name of membership package.', 'twentytwentyfive' ); ?></h3>
    7474                    <!-- /wp:heading -->
    7575
    7676                    <!-- wp:paragraph {"fontSize":"small"} -->
    77                     <p class="has-small-font-size">Get access to our paid newsletter and a limited pass for one event.</p>
     77                    <p class="has-small-font-size"><?php esc_html_e( 'Get access to our paid newsletter and a limited pass for one event.', 'twentytwentyfive' ); ?></p>
    7878                    <!-- /wp:paragraph -->
    7979                </div>
    … …  
    8383                <div class="wp-block-column" style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0">
    8484                    <!-- wp:heading {"textAlign":"right","level":3} -->
    85                     <h3 class="wp-block-heading has-text-align-right">20€</h3>
     85                    <h3 class="wp-block-heading has-text-align-right"><?php esc_html_e( '20€', 'twentytwentyfive' ); ?></h3>
    8686                    <!-- /wp:heading -->
    8787
    8888                    <!-- wp:paragraph {"align":"right","style":{"spacing":{"margin":{"top":"0"}}},"fontSize":"small"} -->
    89                     <p class="has-text-align-right has-small-font-size" style="margin-top:0">Month</p>
     89                    <p class="has-text-align-right has-small-font-size" style="margin-top:0"><?php esc_html_e( 'Month', 'twentytwentyfive' ); ?></p>
    9090                    <!-- /wp:paragraph -->
    9191                </div>
    … …  
    9797            <div class="wp-block-buttons" style="margin-top:var(--wp--preset--spacing--30)">
    9898                <!-- wp:button {"width":100,"style":{"typography":{"lineHeight":"1.2","letterSpacing":"0.08px"}}} -->
    99                 <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button" rel="#">Join</a></div>
     99                <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Join', 'Button text, refers to joining a community. Verb.', 'twentytwentyfive' ); ?></a></div>
    100100                <!-- /wp:button -->
    101101            </div>
    … …  
    111111                <div class="wp-block-column" style="flex-basis:70%">
    112112                    <!-- wp:heading {"level":3,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}},"fontSize":"large"} -->
    113                     <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)">Expert</h3>
     113                    <h3 class="wp-block-heading has-large-font-size" style="margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html_x( 'Expert', 'Name of membership package.', 'twentytwentyfive' ); ?></h3>
    114114                    <!-- /wp:heading -->
    115115
    116116                    <!-- wp:paragraph {"fontSize":"small"} -->
    117                     <p class="has-small-font-size">Get access to our paid newsletter and an unlimited pass.</p>
     117                    <p class="has-small-font-size"><?php esc_html_e( 'Get access to our paid newsletter and an unlimited pass.', 'twentytwentyfive' ); ?></p>
    118118                    <!-- /wp:paragraph -->
    119119                </div>
    … …  
    123123                <div class="wp-block-column" style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0">
    124124                    <!-- wp:heading {"textAlign":"right","level":3} -->
    125                     <h3 class="wp-block-heading has-text-align-right">40€</h3>
     125                    <h3 class="wp-block-heading has-text-align-right"><?php esc_html_e( '40€', 'twentytwentyfive' ); ?></h3>
    126126                    <!-- /wp:heading -->
    127127
    128128                    <!-- wp:paragraph {"align":"right","style":{"spacing":{"margin":{"top":"0"}}},"fontSize":"small"} -->
    129                     <p class="has-text-align-right has-small-font-size" style="margin-top:0">Month</p>
     129                    <p class="has-text-align-right has-small-font-size" style="margin-top:0"><?php esc_html_e( 'Month', 'twentytwentyfive' ); ?></p>
    130130                    <!-- /wp:paragraph -->
    131131                </div>
    … …  
    137137            <div class="wp-block-buttons" style="margin-top:var(--wp--preset--spacing--30)">
    138138                <!-- wp:button {"width":100,"style":{"typography":{"lineHeight":"1.2","letterSpacing":"0.08px"}}} -->
    139                 <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button" rel="">Join</a></div>
     139                <div class="wp-block-button has-custom-width wp-block-button__width-100" style="letter-spacing:0.08px;line-height:1.2"><a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Join', 'Button text, refers to joining a community. Verb.', 'twentytwentyfive' ); ?></a></div>
    140140                <!-- /wp:button -->
    141141            </div>
Note: See TracChangeset for help on using the changeset viewer.