Ticket #33229: 33229.2.patch

src/wp-admin/css/customize-controls.css

@@ -41 +41 @@
         border-bottom: 1px solid #ddd;
 }
 
-#customize-header-actions .secondary-actions {
-        display: none;
-}
-
 #customize-controls .wp-full-overlay-sidebar-content {
         overflow-y: auto;
         overflow-x: hidden;
@@ -273 +269 @@
         left: -100%;
 }
 
-.section-open .control-panel-back {
-        display: none;
-}
-
 .accordion-sub-container.control-panel-content {
         display: none;
         position: absolute;
@@ -300 +292 @@
         width: 100%;
 }
 
-.customize-overlay-close,
 .customize-controls-close {
         display: block;
         position: absolute;
@@ -322 +313 @@
         box-sizing: content-box;
 }
 
-.customize-overlay-close {
-        left: auto;
-        right: 0;
-        border-right: 0;
-        border-left: 1px solid #ddd;
-}
-
-.control-panel-back {
-        display: block;
-        position: fixed;
-        top: 0;
-        z-index: 99;
-        left: -48px;
-        width: 45px;
-        height: 45px;
-        padding-right: 2px;
-        background: #eee;
-        border-right: 1px solid #ddd;
-        cursor: pointer;
-        -webkit-transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-        transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-}
-
 .customize-panel-back,
 .customize-section-back {
         display: block;
@@ -367 +335 @@
         height: 70px;
 }
 
-.ios .control-panel-back,
 .ios .customize-panel-back,
 .ios .customize-section-back {
         -webkit-transition: left 0s;
         transition: left 0s;
 }
 
-.collapsed .control-panel-back,
 .ios .customize-panel-back {
         display: none;
 }
@@ -392 +358 @@
         color: #555;
 }
 
-.customize-overlay-close:focus,
-.customize-overlay-close:hover,
 .customize-controls-close:focus,
 .customize-controls-close:hover,
-.control-panel-back:focus,
-.control-panel-back:hover,
 .customize-controls-preview-toggle:focus,
 .customize-controls-preview-toggle:hover {
         background: #ddd;
@@ -419 +381 @@
         box-shadow: none;
 }
 
-.customize-overlay-close:before,
 .customize-controls-close:before {
         font: normal 22px/45px dashicons;
         content: "\f335";
@@ -436 +397 @@
         left: 13px;
 }
 
-.control-panel-back:before {
-        font: normal 20px/45px dashicons;
-        content: "\f341";
-        position: relative;
-        top: 1px;
-        left: 13px;
-}
-
 .wp-full-overlay-sidebar .wp-full-overlay-header {
         -webkit-transition: padding ease-in-out .18s;
         transition: padding ease-in-out .18s;

src/wp-admin/customize.php

@@ -123 +123 @@
 <div class="wp-full-overlay expanded">
         <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
                 <div id="customize-header-actions" class="wp-full-overlay-header">
-                        <div class="primary-actions">
-                                <?php
-                                        $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-                                        submit_button( $save_text, 'primary save', 'save', false );
-                                ?>
-                                <span class="spinner"></span>
-                                <a class="customize-controls-preview-toggle" href="#">
-                                        <span class="controls"><?php _e( 'Customize' ); ?></span>
-                                        <span class="preview"><?php _e( 'Preview' ); ?></span>
-                                </a>
-                                <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
-                                        <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
-                                </a>
-                                <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
-                        </div>
-                        <div class="secondary-actions">
-                                <button type="button" class="customize-overlay-close">
-                                        <span class="screen-reader-text"><?php _e( 'Close overlay' ); ?></span>
-                                </button>
-                        </div>
+                        <?php
+                        $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
+                        submit_button( $save_text, 'primary save', 'save', false );
+                        ?>
+                        <span class="spinner"></span>
+                        <a class="customize-controls-preview-toggle" href="#">
+                                <span class="controls"><?php _e( 'Customize' ); ?></span>
+                                <span class="preview"><?php _e( 'Preview' ); ?></span>
+                        </a>
+                        <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
+                                <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
+                        </a>
                 </div>
 
                 <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->

src/wp-admin/js/customize-controls.js

@@ -3387 +3387 @@
                         event.preventDefault();
                 });
 
-                // Go back to the top-level Customizer accordion.
-                $( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) {
-                        if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
-                                return;
-                        }
-
-                        event.preventDefault(); // Keep this AFTER the key filter above
-                        api.panel.each( function ( panel ) {
-                                panel.collapse();
-                        });
-                });
-
                 closeBtn.keydown( function( event ) {
                         if ( 9 === event.which ) // tab
                                 return;

src/wp-admin/js/customize-widgets.js

@@ -177 +177 @@
                         // If the available widgets panel is open and the customize controls are
                         // interacted with (i.e. available widgets panel is blurred) then close the
                         // available widgets panel. Also close on back button click.
-                        $( '#customize-controls, .customize-overlay-close, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {
+                        $( '#customize-controls, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {
                                 var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' );
                                 if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) {
                                         self.close();