Ticket #37013: 37013.3.diff

src/wp-admin/css/common.css

@@ -2985 +2985 @@
 
 /* Metabox collapse arrow indicators */
 .js .sidebar-name .sidebar-name-arrow:before,
-.js .meta-box-sortables .postbox .toggle-indicator:before {
-        content: "\f142";
+.js .meta-box-sortables .postbox .toggle-indicator:before,
+.js .accordion-section .handlediv .sidebar-name-arrow:before {
         display: inline-block;
         font: normal 20px/1 dashicons;
         speak: none;
@@ -2995 +2995 @@
         text-decoration: none !important;
 }
 
-.js .widgets-holder-wrap.closed .sidebar-name-arrow:before,
-.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before {
-        content: "\f140";
+/* Open state */
+.js .sidebar-name .sidebar-name-arrow:before,
+.js .meta-box-sortables .postbox .toggle-indicator:before,
+.js .accordion-section.open .handlediv .sidebar-name-arrow:before {
+        content: "\f142";
 }
 
-.js .sidebar-name .sidebar-name-arrow:before {
-        padding: 10px;
-        left: 0;
+/* Closed state */
+.js .widgets-holder-wrap.closed .sidebar-name-arrow:before,
+.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,
+.js .accordion-section .handlediv .sidebar-name-arrow:before {
+        content: "\f140";
 }
 
 .js #widgets-left .sidebar-name .sidebar-name-arrow {
@@ -3041 +3045 @@
                 0 0 2px 1px rgba(30, 140, 190, .8);
 }
 
+.js .metabox-holder .accordion-section .accordion-section-title:after {
+        content: none;
+}
+
+.js .metabox-holder .accordion-section .handlediv {
+        float: right;
+        position: relative;
+        top: 11px;
+        margin-right: 11px;
+        z-index: 2;
+}
+
+.js .metabox-holder .accordion-section .handlediv .sidebar-name-arrow:before {
+        width: 20px;
+        border-radius: 50%;
+        text-indent: -1px; /* account for the dashicon alignment */
+}
+
+.js .metabox-holder .accordion-section .handlediv:focus {
+        outline: none;
+        border: none;
+        box-shadow: none;
+}
+
+.js .metabox-holder .accordion-section .handlediv:focus .sidebar-name-arrow:before {
+        box-shadow:
+                0 0 0 1px #5b9dd9,
+                0 0 2px 1px rgba(30, 140, 190, .8);
+}
+
 /* @todo: appears to be Press This only and overridden */
 #photo-add-url-div input[type="text"] {
         width: 300px;
@@ -3136 +3170 @@
 .nav-menus-php .item-edit:before,
 .widget-top a.widget-action:after,
 .control-section .accordion-section-title:after,
-.accordion-section-title:after {
+.accordion-section-title:after,
+.accordion-section-arrow:after {
         right: 0;
         content: "\f140";
         border: none;
@@ -3184 +3219 @@
 }
 
 .widget-top a.widget-action:focus:after {
-        -webkit-box-shadow:
-                0 0 0 1px #5b9dd9,
-                0 0 2px 1px rgba(30,140,190,.8);
         box-shadow:
                 0 0 0 1px #5b9dd9,
                 0 0 2px 1px rgba(30,140,190,.8);
@@ -3202 +3234 @@
 .control-section.open .accordion-section-title:after,
 #customize-info.open .accordion-section-title:after,
 .nav-menus-php .menu-item-edit-active .item-edit:before,
-.widget.open .widget-top a.widget-action:after {
+.widget.open .widget-top a.widget-action:after,
+.open .accordion-section-arrow:after {
         content: "\f142";
 }
 

src/wp-admin/css/widgets.css

@@ -91 +91 @@
         box-sizing: border-box;
 }
 
-.sidebar-name-arrow {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
+.js .sidebar-name .handlediv {
+        float: right;
+    width: 48px;
+    height: 48px;
+    padding: 0;
+}
+
+.js .sidebar-name .handlediv:focus {
+        box-shadow: none;
+        outline: none;
+}
+
+.js .sidebar-name .handlediv:focus .sidebar-name-arrow:before {
+        box-shadow:
+                0 0 0 1px #5b9dd9,
+                0 0 2px 1px rgba(30, 140, 190, .8);
+}
+
+.js .sidebar-name .sidebar-name-arrow:before {
+        margin-top: 4px;
+        width: 20px;
+        border-radius: 50%;
+        text-indent: -1px; /* account for the dashicon alignment */
 }
 
 .js .sidebar-name {
@@ -249 +267 @@
         padding: 15px 7px;
 }
 
-div#widgets-right .sidebar-name .sidebar-name-arrow:before {
-        top: 2px;
-}
-
 div#widgets-right .widget-top {
         padding: 0;
 }

src/wp-admin/includes/template.php

@@ -1148 +1148 @@
                                         }
                                         ?>
                                         <li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
-                                                <h3 class="accordion-section-title hndle" tabindex="0">
+                                                <button type="button" class="handlediv button-link" aria-expanded="true">
+                                                        <span class="screen-reader-text"><?php echo sprintf( __( 'Toggle panel: %s' ), $sidebar_name ); ?></span>
+                                                        <span class="sidebar-name-arrow" aria-hidden="true"></span>
+                                                </button>
+                                                <h3 class="accordion-section-title">
                                                         <?php echo esc_html( $box['title'] ); ?>
-                                                        <span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
                                                 </h3>
                                                 <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
                                                         <div class="inside">

src/wp-admin/includes/widgets.php

@@ -80 +80 @@
         if ( $sidebar_name ) {
                 ?>
                 <div class="sidebar-name">
-                        <div class="sidebar-name-arrow"><br /></div>
+                        <button type="button" class="handlediv button-link" aria-expanded="true">
+                                <span class="screen-reader-text"><?php echo sprintf( __( 'Toggle panel: %s' ), $sidebar_name ); ?></span>
+                                <span class="sidebar-name-arrow" aria-hidden="true"></span>
+                        </button>
                         <h2><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h2>
                 </div>
                 <?php
@@ -278 +281 @@
  */
 function wp_widgets_access_body_class($classes) {
         return "$classes widgets_access ";
-}
- No newline at end of file
+}

src/wp-admin/js/accordion.js

@@ -33 +33 @@
         $( document ).ready( function () {
 
                 // Expand/Collapse accordion sections on click.
-                $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) {
+                $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title, .handlediv', function( e ) {
                         if ( e.type === 'keydown' && 13 !== e.which ) { // "return" key
                                 return;
                         }