Make WordPress Core


Ignore:
Timestamp:
11/12/2020 06:34:44 PM (5 years ago)
Author:
desrosj
Message:

Twenty Twenty-One: Merge the latest changes changes from GitHub for Beta 4.

In addition to syncing the latest changes, this change also merges the theme’s .scss files and other related build tool configurations required to compile the theme’s CSS.

This will allow development of the theme to continue on Trac after 5.6 is released and the GitHub repository is archived.

For a full list of changes since [], see https://github.com/WordPress/twentytwentyone/compare/e7d5991...aa284fd.

Props poena, luminuu kjellr, aristath, justinahinon.
See #51526.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentytwentyone/inc/starter-content.php

    r49478 r49574  
    4141                    <div class="wp-block-columns alignwide are-vertically-aligned-center is-style-twentytwentyone-columns-overlap"><!-- wp:column {"verticalAlignment":"center"} -->
    4242                    <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"full","sizeSlug":"large"} -->
    43                     <figure class="wp-block-image alignfull size-large"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="' . esc_attr__( 'Roses Tremieres (Hollyhocks), by Berthe Morisot, 1884', 'twentytwentyone' ) . '"/></figure>
     43                    <figure class="wp-block-image alignfull size-large"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="' . esc_attr__( '&#8220;Roses Tremieres&#8221; by Berthe Morisot', 'twentytwentyone' ) . '"/></figure>
    4444                    <!-- /wp:image -->
    4545
     
    4949
    5050                    <!-- wp:image {"align":"full","sizeSlug":"large","className":"is-style-twentytwentyone-image-frame"} -->
    51                     <figure class="wp-block-image alignfull size-large is-style-twentytwentyone-image-frame"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/in-the-bois-de-boulogne.jpg" alt="' . esc_attr__( 'In the Bois de Boulogne, by Berthe Morisot, 1879', 'twentytwentyone' ) . '"/></figure>
     51                    <figure class="wp-block-image alignfull size-large is-style-twentytwentyone-image-frame"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/in-the-bois-de-boulogne.jpg" alt="' . esc_attr__( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'twentytwentyone' ) . '"/></figure>
    5252                    <!-- /wp:image --></div>
    5353                    <!-- /wp:column -->
     
    5959
    6060                    <!-- wp:image {"sizeSlug":"large","className":"alignfull size-full is-style-twentytwentyone-border"} -->
    61                     <figure class="wp-block-image size-large alignfull size-full is-style-twentytwentyone-border"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/young-woman-in-mauve.jpg" alt="' . esc_attr__( 'Young Woman in Mauve, by Berthe Morisot, 1880', 'twentytwentyone' ) . '"/></figure>
     61                    <figure class="wp-block-image size-large alignfull size-full is-style-twentytwentyone-border"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/young-woman-in-mauve.jpg" alt="' . esc_attr__( '&#8220;Young Woman in Mauve&#8221; by Berthe Morisot', 'twentytwentyone' ) . '"/></figure>
    6262                    <!-- /wp:image --></div>
    6363                    <!-- /wp:column --></div>
     
    152152            // Assign a menu to the "primary" location.
    153153            'primary' => array(
    154                 'name'  => esc_html__( 'Primary', 'twentytwentyone' ),
     154                'name'  => esc_html__( 'Primary Menu', 'twentytwentyone' ),
    155155                'items' => array(
    156156                    'link_home', // Note that the core "home" page is actually a link in case a static front page is not used.
     
    163163            // Assign a menu to the "footer" location.
    164164            'footer'  => array(
    165                 'name'  => esc_html__( 'Footer', 'twentytwentyone' ),
     165                'name'  => esc_html__( 'Secondary Menu', 'twentytwentyone' ),
    166166                'items' => array(
    167167                    'link_facebook',
Note: See TracChangeset for help on using the changeset viewer.