Make WordPress Core


Ignore:
Timestamp:
10/17/2023 02:12:07 AM (3 years ago)
Author:
hellofromTonya
Message:

Twenty Twenty-Four: Bugfixes for 6.4 RC1.

Resyncing changes for TT4 into Core.

Changes include:

  • Reformatted all the patterns for readability.
  • Bugfixes in the markup and improvements on the string translation functions.
  • Renaming of some patterns, making them consistent with the content they show and whether they are simple patterns, full-page patterns or patterns meant to replace templates.

Follow-up to [56813], [56764], [56716].

Props richtabor, onemaggie, luminuu, shailu25, dunhakdis, shivashankerbhatta, dajeema, enodekciw, kafleg, viralsampat, glendaviesnz, beafialho, webmandesign, huzaifaalmesbah, gregfuller, benharri.
Fixes #59640.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentytwentyfour/patterns/footer.php

    r56764 r56951  
    11<?php
    22/**
    3  * Title: Default footer
     3 * Title: Footer with colophon, 4 columns
    44 * Slug: twentytwentyfour/footer
    55 * Categories: footer
    … …  
    99
    1010<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
    11 <div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"wide"} -->
    12 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"30%"} -->
    13 <div class="wp-block-column" style="flex-basis:30%"><!-- wp:group {"style":{"dimensions":{"minHeight":""},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","orientation":"vertical"}} -->
    14 <div class="wp-block-group"><!-- wp:site-logo {"width":20,"shouldSyncIcon":true,"style":{"layout":{"selfStretch":"fit","flexSize":null}}} /-->
     11<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
     12        <!-- wp:columns {"align":"wide"} -->
     13        <div class="wp-block-columns alignwide">
     14                <!-- wp:column {"width":"30%"} -->
     15                <div class="wp-block-column" style="flex-basis:30%">
     16                        <!-- wp:group {"style":{"dimensions":{"minHeight":""},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","orientation":"vertical"}} -->
     17                        <div class="wp-block-group">
     18                                <!-- wp:site-logo {"width":20,"shouldSyncIcon":true,"style":{"layout":{"selfStretch":"fit","flexSize":null}}} /-->
    1519
    16 <!-- wp:site-title {"level":0,"fontSize":"medium"} /-->
     20                                <!-- wp:site-title {"level":0,"fontSize":"medium"} /-->
    1721
    18 <!-- wp:site-tagline {"fontSize":"small"} /--></div>
    19 <!-- /wp:group --></div>
    20 <!-- /wp:column -->
     22                                <!-- wp:site-tagline {"fontSize":"small"} /-->
     23                        </div>
     24                        <!-- /wp:group -->
     25                </div>
     26                <!-- /wp:column -->
    2127
    22 <!-- wp:column {"width":"20%"} -->
    23 <div class="wp-block-column" style="flex-basis:20%"></div>
    24 <!-- /wp:column -->
     28                <!-- wp:column {"width":"20%"} -->
     29                <div class="wp-block-column" style="flex-basis:20%">
     30                </div>
     31                <!-- /wp:column -->
    2532
    26 <!-- wp:column {"width":"50%"} -->
    27 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
    28 <div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
    29 <div class="wp-block-group"><!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
    30 <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'About', 'twentytwentyfour' ); ?></h2>
    31 <!-- /wp:heading -->
     33                <!-- wp:column {"width":"50%"} -->
     34                <div class="wp-block-column" style="flex-basis:50%">
     35                        <!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
     36                        <div class="wp-block-group">
     37                                <!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
     38                                <div class="wp-block-group">
     39                                        <!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
     40                                        <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'About', 'twentytwentyfour' ); ?></h2>
     41                                        <!-- /wp:heading -->
    3242
    33 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
    34 <div class="wp-block-group">
     43                                        <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
     44                                        <div class="wp-block-group">
    3545
    36 <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'About', 'twentytwentyfour' ); ?>"} -->
     46                                                <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'About', 'twentytwentyfour' ); ?>"} -->
    3747
    38 <!-- wp:navigation-link {"label":"Team","url":"#"} /-->
    39 <!-- wp:navigation-link {"label":"History","url":"#"} /-->
    40 <!-- wp:navigation-link {"label":"Careers","url":"#"} /-->
     48                                                <!-- wp:navigation-link {"label":"Team","url":"#"} /-->
     49                                                <!-- wp:navigation-link {"label":"History","url":"#"} /-->
     50                                                <!-- wp:navigation-link {"label":"Careers","url":"#"} /-->
    4151
    42 <!-- /wp:navigation -->
     52                                                <!-- /wp:navigation -->
    4353
     54                                        </div>
     55                                        <!-- /wp:group -->
     56                                </div>
     57
     58                                <!-- /wp:group -->
     59
     60                                <!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
     61                                <div class="wp-block-group">
     62                                        <!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
     63                                        <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'Privacy', 'twentytwentyfour' ); ?></h2>
     64                                        <!-- /wp:heading -->
     65
     66                                        <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
     67                                        <div class="wp-block-group">
     68
     69                                                <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Privacy', 'twentytwentyfour' ); ?>"} -->
     70
     71                                                <!-- wp:navigation-link {"label":"Privacy Policy","url":"#"} /-->
     72                                                <!-- wp:navigation-link {"label":"Terms and Conditions","url":"#"} /-->
     73                                                <!-- wp:navigation-link {"label":"Contact Us","url":"#"} /-->
     74
     75                                                <!-- /wp:navigation -->
     76
     77                                        </div>
     78                                        <!-- /wp:group -->
     79                                </div>
     80                                <!-- /wp:group -->
     81
     82                                <!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
     83                                <div class="wp-block-group">
     84                                        <!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
     85                                        <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'Social', 'twentytwentyfour' ); ?></h2>
     86                                        <!-- /wp:heading -->
     87
     88                                        <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
     89                                        <div class="wp-block-group">
     90
     91                                                <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Social Media', 'twentytwentyfour' ); ?>"} -->
     92
     93                                                <!-- wp:navigation-link {"label":"Facebook","url":"#"} /-->
     94                                                <!-- wp:navigation-link {"label":"Instagram","url":"#"} /-->
     95                                                <!-- wp:navigation-link {"label":"Twitter/X","url":"#"} /-->
     96
     97                                                <!-- /wp:navigation -->
     98
     99                                        </div>
     100                                        <!-- /wp:group -->
     101                                </div>
     102                                <!-- /wp:group -->
     103                        </div>
     104                        <!-- /wp:group -->
     105                </div>
     106                <!-- /wp:column -->
     107        </div>
     108        <!-- /wp:columns -->
     109
     110        <!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"0"}}}} -->
     111        <div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:0">
     112                <!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2","fontSize":"small"} -->
     113                <p class="has-contrast-2-color has-text-color has-link-color has-small-font-size">
     114                <?php
     115                        /* Translators: WordPress link. */
     116                        $wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfour' ) ) . '" rel="nofollow">WordPress</a>';
     117                        echo sprintf(
     118                                /* Translators: Designed with WordPress */
     119                                esc_html__( 'Designed with %1$s', 'twentytwentyfour' ),
     120                                $wordpress_link
     121                        );
     122                        ?>
     123                </p>
     124                <!-- /wp:paragraph -->
     125        </div>
     126        <!-- /wp:group -->
    44127</div>
    45 <!-- /wp:group --></div>
    46 
    47128<!-- /wp:group -->
    48 
    49 <!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
    50 <div class="wp-block-group"><!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
    51 <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'Privacy', 'twentytwentyfour' ); ?></h2>
    52 <!-- /wp:heading -->
    53 
    54 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
    55 <div class="wp-block-group">
    56 
    57 <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Privacy', 'twentytwentyfour' ); ?>"} -->
    58 
    59 <!-- wp:navigation-link {"label":"Privacy Policy","url":"#"} /-->
    60 <!-- wp:navigation-link {"label":"Terms and Conditions","url":"#"} /-->
    61 <!-- wp:navigation-link {"label":"Contact Us","url":"#"} /-->
    62 
    63 <!-- /wp:navigation -->
    64 
    65 </div>
    66 <!-- /wp:group --></div>
    67 <!-- /wp:group -->
    68 
    69 <!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
    70 <div class="wp-block-group"><!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontFamily":"body"} -->
    71 <h2 class="wp-block-heading has-medium-font-size has-body-font-family" style="font-style:normal;font-weight:600"><?php esc_html_e( 'Social Media', 'twentytwentyfour' ); ?></h2>
    72 <!-- /wp:heading -->
    73 
    74 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical"}} -->
    75 <div class="wp-block-group">
    76 
    77 <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Social Media', 'twentytwentyfour' ); ?>"} -->
    78 
    79 <!-- wp:navigation-link {"label":"Facebook","url":"#"} /-->
    80 <!-- wp:navigation-link {"label":"Instagram","url":"#"} /-->
    81 <!-- wp:navigation-link {"label":"Twitter/X","url":"#"} /-->
    82 
    83 <!-- /wp:navigation -->
    84 
    85 </div>
    86 <!-- /wp:group --></div>
    87 <!-- /wp:group --></div>
    88 <!-- /wp:group --></div>
    89 <!-- /wp:column --></div>
    90 <!-- /wp:columns -->
    91 
    92 <!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"0"}}}} -->
    93 <div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:0"><!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2","fontSize":"small"} -->
    94 <p class="has-contrast-2-color has-text-color has-link-color has-small-font-size">
    95 
    96         <?php
    97                 /* Translators: WordPress link. */
    98                 $wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'twentytwentyfour' ) ) . '" rel="nofollow">WordPress</a>';
    99                 echo sprintf(
    100                         /* Translators: Designed with WordPress */
    101                         esc_html__( 'Designed with %1$s', 'twentytwentyfour' ),
    102                         $wordpress_link
    103                 );
    104                 ?>
    105 </p>
    106 <!-- /wp:paragraph --></div>
    107 <!-- /wp:group --></div>
    108 <!-- /wp:group -->
Note: See TracChangeset for help on using the changeset viewer.