Changeset 32844
- Timestamp:
- 06/18/2015 04:35:12 PM (8 years ago)
- Location:
- trunk/src/wp-admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/css/common.css
r32796 r32844 1444 1444 } 1445 1445 1446 #screen-meta-links a {1447 padding: 3px 6px 3px 16px;1448 }1449 1450 #screen-meta-links a:focus {1451 outline: none;1452 }1453 1454 1446 /* screen options and help tabs revert */ 1455 1447 #screen-meta { … … 1481 1473 } 1482 1474 1483 #screen-meta-links a { 1475 #screen-meta-links .show-settings { 1476 border: 0; 1477 background: none; 1478 border-radius: 0; 1484 1479 color: #777; 1485 } 1486 1487 #screen-meta-links a:hover, 1488 #screen-meta-links a:active, 1489 #screen-meta-links a:focus { 1480 line-height: 1.7; 1481 padding: 3px 6px 3px 16px; 1482 } 1483 1484 #screen-meta-links .show-settings:hover, 1485 #screen-meta-links .show-settings:active, 1486 #screen-meta-links .show-settings:focus { 1490 1487 color: #32373c; 1491 1488 } 1492 1489 1493 #screen-meta-links a.show-settings { 1494 display: block; 1495 font-size: 13px; 1496 height: 22px; 1497 line-height: 22px; 1498 text-decoration: none; 1499 z-index: 1; 1500 } 1501 1502 #screen-meta-links a:after { 1490 #screen-meta-links .show-settings:after { 1503 1491 right: 0; 1504 1492 content: '\f140'; … … 1516 1504 } 1517 1505 1518 #screen-meta-links a.screen-meta-active:after {1506 #screen-meta-links .screen-meta-active:after { 1519 1507 content: '\f142'; 1520 1508 } 1521 1509 1522 #screen-meta-links a.show-settings:hover {1523 text-decoration: none;1524 }1525 1510 /* end screen options and help tabs */ 1526 1511 -
trunk/src/wp-admin/includes/screen.php
r32707 r32844 975 975 <?php if ( $this->get_help_tabs() ) : ?> 976 976 <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle"> 977 < a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></a>977 <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button> 978 978 </div> 979 979 <?php endif; 980 980 if ( $this->show_screen_options() ) : ?> 981 981 <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle"> 982 < a href="#screen-options-wrap" id="show-settings-link" class="show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></a>982 <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button> 983 983 </div> 984 984 <?php endif; ?> -
trunk/src/wp-admin/js/common.js
r32751 r32844 106 106 init: function() { 107 107 this.element = $('#screen-meta'); 108 this.toggles = $( '.screen-meta-toggle a');108 this.toggles = $( '#screen-meta-links' ).find( '.show-settings' ); 109 109 this.page = $('#wpcontent'); 110 110 … … 112 112 }, 113 113 114 toggleEvent: function( e ) { 115 var panel = $( this.href.replace(/.+#/, '#') ); 116 e.preventDefault(); 114 toggleEvent: function() { 115 var panel = $( '#' + $( this ).attr( 'aria-controls' ) ); 117 116 118 117 if ( !panel.length ) … … 125 124 }, 126 125 127 open: function( panel, link) {128 129 $( '.screen-meta-toggle').not( link.parent() ).css('visibility', 'hidden');126 open: function( panel, button ) { 127 128 $( '#screen-meta-links' ).find( '.screen-meta-toggle' ).not( button.parent() ).css( 'visibility', 'hidden' ); 130 129 131 130 panel.parent().show(); 132 131 panel.slideDown( 'fast', function() { 133 132 panel.focus(); 134 link.addClass('screen-meta-active').attr('aria-expanded', true);133 button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', true ); 135 134 }); 136 135 … … 138 137 }, 139 138 140 close: function( panel, link) {139 close: function( panel, button ) { 141 140 panel.slideUp( 'fast', function() { 142 link.removeClass('screen-meta-active').attr('aria-expanded', false);141 button.removeClass( 'screen-meta-active' ).attr( 'aria-expanded', false ); 143 142 $('.screen-meta-toggle').css('visibility', ''); 144 143 panel.parent().hide();
Note: See TracChangeset
for help on using the changeset viewer.