Changeset 46445 for trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php

Timestamp:

10/08/2019 07:05:53 PM (6 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings trunk's version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46357], see ​https://github.com/WordPress/twentytwenty/compare/7157870...7246fd6.

Props anlino, ianbelanger, poena, williampatton, nielslange, acosmin, netweb, joyusly, luminuu, itowhid06, cbravobernal, intimez, glauberglauber, ocean90, amolv, briceduclos, aristath, mukesh27, garrett-eclipse, audrasjb, afercia, dianeco, utsav72640, mahesh901122, tobifjellner.
See #48110.

File:

• trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php

@@ -30 +30 @@
             $footer_top_classes .= $has_social_menu ? ' has-social-menu' : '';
 
-            $footer_social_wrapper_class = $has_footer_menu ? 'footer-social-wrapper' : '';
-
             if ( $has_footer_menu || $has_social_menu ) {
                 ?>
-                <div class="footer-top<?php echo esc_attr( $footer_top_classes ); ?>">
+                <div class="footer-top<?php echo $footer_top_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">
                     <?php if ( $has_footer_menu ) { ?>
 
-                        <nav aria-label="<?php esc_attr_e( 'Footer', 'twentytwenty' ); ?>" role="navigation">
+                        <nav aria-label="<?php esc_attr_e( 'Footer', 'twentytwenty' ); ?>" role="navigation" class="footer-menu-wrapper">
 
                             <ul class="footer-menu reset-list-style">
@@ -57 +55 @@
                     <?php if ( $has_social_menu ) { ?>
 
-                        <div class="<?php echo esc_attr( $footer_social_wrapper_class ); ?>">
+                        <nav aria-label="<?php esc_attr_e( 'Social links', 'twentytwenty' ); ?>" class="footer-social-wrapper">
 
-                            <nav aria-label="<?php esc_attr_e( 'Social links', 'twentytwenty' ); ?>">
+                            <ul class="social-menu footer-social reset-list-style social-icons fill-children-current-color">
 
-                                <ul class="social-menu footer-social reset-list-style social-icons s-icons">
+                                <?php
+                                wp_nav_menu(
+                                    array(
+                                        'theme_location'  => 'social',
+                                        'container'       => '',
+                                        'container_class' => '',
+                                        'items_wrap'      => '%3$s',
+                                        'menu_id'         => '',
+                                        'menu_class'      => '',
+                                        'depth'           => 1,
+                                        'link_before'     => '<span class="screen-reader-text">',
+                                        'link_after'      => '</span>',
+                                        'fallback_cb'     => '',
+                                    )
+                                );
+                                ?>
 
-                                    <?php
-                                    wp_nav_menu(
-                                        array(
-                                            'theme_location' => 'social',
-                                            'container'   => '',
-                                            'container_class' => '',
-                                            'items_wrap'  => '%3$s',
-                                            'menu_id'     => '',
-                                            'menu_class'  => '',
-                                            'depth'       => 1,
-                                            'link_before' => '<span class="screen-reader-text">',
-                                            'link_after'  => '</span>',
-                                            'fallback_cb' => '',
-                                        )
-                                    );
-                                    ?>
+                            </ul><!-- .footer-social -->
 
-                                </ul>
-
-                            </nav><!-- .social-menu -->
-
-                        </div><!-- .footer-social-wrapper -->
+                        </nav><!-- .footer-social-wrapper -->
 
                     <?php } ?>