Make WordPress Core


Ignore:
Timestamp:
11/12/2020 06:34:44 PM (3 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/functions.php

    r49478 r49574  
    7474        register_nav_menus(
    7575            array(
    76                 'primary' => esc_html__( 'Primary Navigation', 'twentytwentyone' ),
    77                 'footer'  => __( 'Footer Navigation', 'twentytwentyone' ),
     76                'primary' => esc_html__( 'Primary Menu', 'twentytwentyone' ),
     77                'footer'  => __( 'Secondary Menu', 'twentytwentyone' ),
    7878            )
    7979        );
     
    456456function twentytwentyone_block_editor_script() {
    457457
    458     wp_enqueue_script( 'twentytwentyone-unregister-block-style', get_theme_file_uri( '/assets/js/unregister-block-style.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
     458    wp_enqueue_script( 'twentytwentyone-editor', get_theme_file_uri( '/assets/js/editor.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
    459459}
    460460
Note: See TracChangeset for help on using the changeset viewer.