Ticket #28655: 28655.2.patch

wp-admin/js/customize-controls.js

@@ -1045 +1045 @@
 
                                 if ( ! activated() ) {
                                         save.val( api.l10n.activate ).prop( 'disabled', false );
-                                        back.text( api.l10n.cancel );
-
+                                        
                                 } else if ( saved() ) {
                                         save.val( api.l10n.saved ).prop( 'disabled', true );
                                         back.text( api.l10n.close );
 
                                 } else {
                                         save.val( api.l10n.save ).prop( 'disabled', false );
-                                        back.text( api.l10n.cancel );
                                 }
                         });
 
@@ -1197 +1195 @@
 
                 api.trigger( 'ready' );
 
-                // Make sure left column gets focus
-                topFocus = $('.back');
-                topFocus.focus();
-                setTimeout(function () {
-                        topFocus.focus();
-                }, 200);
-
         });
 
 })( wp, jQuery );

wp-admin/customize.php

@@ -108 +108 @@
                                 submit_button( $save_text, 'primary save', 'save', false );
                         ?>
                         <span class="spinner"></span>
-                        <a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
-                                <?php _e( 'Cancel' ); ?>
-                        </a>
+                        <a class="back" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>"></a>
                 </div>
 
                 <?php

wp-admin/css/customize-controls.css

@@ -209 +209 @@
         height: 22px;
 }
 
+a.back {
+        color: #444;
+        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 ease-in-out .18s, color ease-in .1s;
+        transition: left ease-in-out .18s, color ease-in .1s;
+}
+
+
+a.back:hover,
+a.back:focus {
+        background-color: #0074a2;
+        color: #fff;
+        outline: none;
+}
+
 #customize-header-actions a.back {
         position: relative;
         left: 0;
@@ -216 +241 @@
         transition: left ease-in-out .18s;
 }
 
+a.back:before {
+        font: normal 29px/1 dashicons;
+        content: "\f335";
+        position: relative;
+        top: 9px;
+        left: 9px;
+}
+
 .in-sub-panel #customize-header-actions a.back {
         left: -120px;
 }
@@ -223 +256 @@
 .wp-full-overlay-sidebar .wp-full-overlay-header {
         -webkit-transition: padding ease-in-out .18s;
         transition: padding ease-in-out .18s;
+        padding: 0 15px 0 0;
 }
 
+.wp-full-overlay-sidebar .wp-full-overlay-header a.back {
+        margin-top: 0;
+}
+
 .in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header {
         padding-left: 62px;
 }