Changeset 49478 for trunk/src/wp-content/themes/twentytwentyone/template-parts/header/site-header.php

Timestamp:

11/02/2020 07:43:07 PM (5 years ago)

Author:

desrosj

Message:

Bundled Themes: Sync Twenty Twenty-One with the latest changes from GitHub.

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

Props poena, luminuu, ryelle, kjellr, aristath, justinahinon, felipeelia, joostdevalk.
See #51526.

File:

• trunk/src/wp-content/themes/twentytwentyone/template-parts/header/site-header.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentytwentyone/template-parts/header/site-header.php

@@ -8 +8 @@
  */
 
-$has_primary_nav = has_nav_menu( 'primary' );
-
 $wrapper_classes  = 'site-header';
 $wrapper_classes .= has_custom_logo() ? ' has-logo' : '';
 $wrapper_classes .= true === get_theme_mod( 'display_title_and_tagline', true ) ? ' has-title-and-tagline' : '';
-$wrapper_classes .= $has_primary_nav ? ' has-menu' : '';
+$wrapper_classes .= has_nav_menu( 'primary' ) ? ' has-menu' : '';
 ?>
 
@@ -19 +17 @@
 
     <?php get_template_part( 'template-parts/header/site-branding' ); ?>
+    <?php get_template_part( 'template-parts/header/site-nav' ); ?>
 
-    <?php if ( $has_primary_nav ) : ?>
-        <nav id="site-navigation" class="primary-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Primary menu', 'twentytwentyone' ); ?>">
-            <div class="menu-button-container">
-                <button id="primary-mobile-menu" class="button" aria-controls="primary-menu-list" aria-expanded="false">
-                    <span class="dropdown-icon open"><?php esc_html_e( 'Menu', 'twentytwentyone' ); ?>
-                        <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'menu' ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
-                    </span>
-                    <span class="dropdown-icon close"><?php esc_html_e( 'Close', 'twentytwentyone' ); ?>
-                        <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'close' ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
-                    </span>
-                </button><!-- #primary-mobile-menu -->
-            </div><!-- .menu-button-container -->
-            <?php
-            wp_nav_menu(
-                array(
-                    'theme_location'  => 'primary',
-                    'menu_class'      => 'menu-wrapper',
-                    'container_class' => 'primary-menu-container',
-                    'items_wrap'      => '<ul id="primary-menu-list" class="%2$s">%3$s</ul>',
-                )
-            );
-            ?>
-        </nav><!-- #site-navigation -->
-    <?php endif; ?>
 </header><!-- #masthead -->