<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[39141] trunk/src: Administration: Ensure collapse menu is usable with a keyboard</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39141">39141</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39141","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-04 16:01:24 +0000 (Fri, 04 Nov 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Administration: Ensure collapse menu is usable with a keyboard
Currently, the "Collapse menu" item is not focusable and keyboard users can't collapse/expand the admin menu. This aims to fix it so that screen readers no longer announce it as a clickable but it remains unfocusable and thus unusable. So it's now a button.
Quoting joedolson at WordCamp Chicago 2014:
"If it's supposed to act like a button, it should be a button."
Also includes a grunt:precommit run that picked up some postcss changes to src/wp-includes/css/customize-preview.css
Fixes <a href="https://core.trac.wordpress.org/ticket/29958">#29958</a>.
Props ajercia, ipm-frommen for an iterative patch, valendesigns for an iterative patch, GaryJ for feedback, joedolson for feedback, helen for feedback</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssadminmenucss">trunk/src/wp-admin/css/admin-menu.css</a></li>
<li><a href="#trunksrcwpadmincsscolors_adminscss">trunk/src/wp-admin/css/colors/_admin.scss</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpincludescsscustomizepreviewcss">trunk/src/wp-includes/css/customize-preview.css</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssadminmenucss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/admin-menu.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/admin-menu.css 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-admin/css/admin-menu.css 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
</span><span class="cx" style="display: block; padding: 0 10px"> .folded #adminmenu a.menu-top:focus + .wp-submenu,
</span><span class="cx" style="display: block; padding: 0 10px"> .folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
</ins><span class="cx" style="display: block; padding: 0 10px"> top: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> left: 36px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,79 +547,82 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-menu {
- font-size: 13px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button {
+ display: block;
+ width: 100%;
+ height: 34px;
+ margin: 0;
+ border: none;
+ padding: 0;
+ position: relative;
+ overflow: visible;
</ins><span class="cx" style="display: block; padding: 0 10px"> line-height: 34px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-top: 10px;
- color: #a0a5aa;
- color: rgba(240,245,250,0.6);
- -webkit-transition: all .1s ease-in-out;
- transition: all .1s ease-in-out;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background: none;
+ color: #aaa;
+ cursor: pointer;
+ outline: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-menu:hover,
-#collapse-menu:hover #collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button:hover,
+#collapse-button:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #00b9eb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.folded #collapse-menu span {
- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button .collapse-button-icon,
+#collapse-button .collapse-button-label {
+ /* absolutely positioned to avoid 1px shift in IE when button is pressed */
+ display: block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ line-height: 34px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-button,
-#collapse-button div {
- width: 15px;
- height: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button .collapse-button-icon {
+ width: 36px;
+ height: 34px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-button {
- float: left;
- height: 15px;
- margin: 10px 8px 10px 11px;
- width: 15px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button .collapse-button-label {
+ padding: 0 0 0 36px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpwrap #collapse-button div {
- padding: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.folded #collapse-button .collapse-button-label {
+ display: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button .collapse-button-icon:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: "\f148";
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- line-height: 15px;
- left: -3px;
- top: -3px;
- color: #a0a5aa;
- color: rgba(240,245,250,0.6);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ position: relative;
+ top: 7px;
+ text-align: center;
</ins><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 dashicons !important;
</span><span class="cx" style="display: block; padding: 0 10px"> speak: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 auto;
- padding: 0 !important;
- position: relative;
- text-align: center;
- width: 20px;
- -webkit-transition: all .1s ease-in-out;
- transition: all .1s ease-in-out;
</del><span class="cx" style="display: block; padding: 0 10px"> -webkit-font-smoothing: antialiased;
</span><span class="cx" style="display: block; padding: 0 10px"> -moz-osx-font-smoothing: grayscale;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* rtl:ignore */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.folded #collapse-button div:after,
-.rtl #collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.folded #collapse-button .collapse-button-icon:after,
+.rtl #collapse-button .collapse-button-icon:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.rtl.folded #collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.rtl.folded #collapse-button .collapse-button-icon:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button .collapse-button-icon:after,
+#collapse-button .collapse-button-label {
+ -webkit-transition: all .1s ease-in-out;
+ transition: all .1s ease-in-out;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Toolbar menu toggle
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,7 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,
</span><span class="cx" style="display: block; padding: 0 10px"> .auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
</span><span class="cx" style="display: block; padding: 0 10px"> .auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
</ins><span class="cx" style="display: block; padding: 0 10px"> top: 0px;
</span><span class="cx" style="display: block; padding: 0 10px"> left: 36px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,22 +734,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 10000;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .auto-fold #collapse-menu span {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .auto-fold #collapse-menu .collapse-button-label {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .auto-fold #collapse-button div {
- background: none;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* rtl:ignore */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .auto-fold #collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .auto-fold #collapse-button .collapse-button-icon:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> transform: rotate(180deg);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .rtl.auto-fold #collapse-button div:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .rtl.auto-fold #collapse-button .collapse-button-icon:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> transform: none;
</span></span></pre></div>
<a id="trunksrcwpadmincsscolors_adminscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/colors/_admin.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/colors/_admin.scss 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-admin/css/colors/_admin.scss 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,23 +227,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Admin Menu: collapse button */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-menu {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: $menu-collapse-text;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-menu:hover {
- color: $menu-collapse-focus-text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#collapse-button:hover,
+#collapse-button:focus {
+ color: $menu-submenu-focus-text;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#collapse-button div:after {
- color: $menu-collapse-icon;
-}
-
-#collapse-menu:hover #collapse-button div:after {
- color: $menu-collapse-focus-icon;
-}
-
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Admin Bar */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar {
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-admin/js/common.js 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> pinnedMenuTop = false,
</span><span class="cx" style="display: block; padding: 0 10px"> pinnedMenuBottom = false,
</span><span class="cx" style="display: block; padding: 0 10px"> menuTop = 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuState,
</ins><span class="cx" style="display: block; padding: 0 10px"> menuIsPinned = false,
</span><span class="cx" style="display: block; padding: 0 10px"> height = {
</span><span class="cx" style="display: block; padding: 0 10px"> window: $window.height(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,59 +212,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $(e.target).parent().siblings('a').get(0).click();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#collapse-menu').on('click.collapse-menu', function() {
- var respWidth, state;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#collapse-button' ).on( 'click.collapse-menu', function() {
+ var viewportWidth = getViewportWidth() || 961;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // reset any compensation for submenus near the bottom of the screen
</span><span class="cx" style="display: block; padding: 0 10px"> $('#adminmenu div.wp-submenu').css('margin-top', '');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.innerWidth ) {
- // window.innerWidth is affected by zooming on phones
- respWidth = Math.max( window.innerWidth, document.documentElement.clientWidth );
- } else {
- // IE < 9 doesn't support @media CSS rules
- respWidth = 961;
- }
-
- if ( respWidth && respWidth < 960 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( viewportWidth < 960 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $body.hasClass('auto-fold') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.removeClass('auto-fold').removeClass('folded');
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('unfold', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'o');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- state = 'open';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuState = 'open';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.addClass('auto-fold');
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('unfold', 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- state = 'folded';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuState = 'folded';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $body.hasClass('folded') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.removeClass('folded');
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'o');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- state = 'open';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuState = 'open';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.addClass('folded');
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'f');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- state = 'folded';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuState = 'folded';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currentMenuItemHasPopup();
- $document.trigger( 'wp-collapse-menu', { state: state } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.trigger( 'wp-collapse-menu', { state: menuState } );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle the `aria-haspopup` attribute on the current menu item when it has a sub-menu.
</span><span class="cx" style="display: block; padding: 0 10px"> function currentMenuItemHasPopup() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var respWidth,
- $current = $( 'a.wp-has-current-submenu' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $current = $( 'a.wp-has-current-submenu' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.innerWidth ) {
- respWidth = Math.max( window.innerWidth, document.documentElement.clientWidth );
- } else {
- respWidth = 961;
- }
-
- if ( $body.hasClass( 'folded' ) || ( $body.hasClass( 'auto-fold' ) && respWidth && respWidth <= 960 && respWidth > 782 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'folded' === menuState ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // When folded or auto-folded and not responsive view, the current menu item does have a fly-out sub-menu.
</span><span class="cx" style="display: block; padding: 0 10px"> $current.attr( 'aria-haspopup', 'true' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $document.on( 'wp-window-resized wp-responsive-activate wp-responsive-deactivate', currentMenuItemHasPopup );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.on( 'wp-menu-state-set wp-collapse-menu wp-responsive-activate wp-responsive-deactivate', currentMenuItemHasPopup );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure an admin submenu is within the visual viewport.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,17 +821,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> trigger: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var width;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var viewportWidth = getViewportWidth();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.innerWidth ) {
- // window.innerWidth is affected by zooming on phones
- width = Math.max( window.innerWidth, document.documentElement.clientWidth );
- } else {
- // Exclude IE < 9, it doesn't support @media CSS rules
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude IE < 9, it doesn't support @media CSS rules.
+ if ( ! viewportWidth ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( width <= 782 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( viewportWidth <= 782 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wpResponsiveActive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'wp-responsive-activate' );
</span><span class="cx" style="display: block; padding: 0 10px"> wpResponsiveActive = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( width <= 480 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( viewportWidth <= 480 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.enableOverlay();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.disableOverlay();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,8 +894,82 @@
</span><span class="cx" style="display: block; padding: 0 10px"> aria_button_if_js();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @summary Get the viewport width.
+ *
+ * @since 4.7
+ *
+ * @returns {number|boolean} The current viewport width or false if the
+ * browser doesn't support innerWidth (IE < 9).
+ */
+ function getViewportWidth() {
+ var viewportWidth = false;
+
+ if ( window.innerWidth ) {
+ // On phones, window.innerWidth is affected by zooming.
+ viewportWidth = Math.max( window.innerWidth, document.documentElement.clientWidth );
+ }
+
+ return viewportWidth;
+ }
+
+ /**
+ * @summary Set the admin menu collapsed/expanded state.
+ *
+ * Sets the global variable `menuState` and triggers a custom event passing
+ * the current menu state.
+ *
+ * @since 4.7
+ *
+ * @returns {void}
+ */
+ function setMenuState() {
+ var viewportWidth = getViewportWidth() || 961;
+
+ if ( viewportWidth <= 782 ) {
+ menuState = 'responsive';
+ } else if ( $body.hasClass( 'folded' ) || ( $body.hasClass( 'auto-fold' ) && viewportWidth <= 960 && viewportWidth > 782 ) ) {
+ menuState = 'folded';
+ } else {
+ menuState = 'open';
+ }
+
+ $document.trigger( 'wp-menu-state-set', { state: menuState } );
+ }
+
+ // Set the menu state when the window gets resized.
+ $document.on( 'wp-window-resized.set-menu-state', setMenuState );
+
+ /**
+ * @summary Set ARIA attributes on the collapse/expand menu button.
+ *
+ * When the admin menu is open or folded, updates the `aria-expanded` and
+ * `aria-label` attributes of the button to give feedback to assistive
+ * technologies. In the responsive view, the button is always hidden.
+ *
+ * @since 4.7
+ *
+ * @returns {void}
+ */
+ $document.on( 'wp-menu-state-set wp-collapse-menu', function( event, eventData ) {
+ var $collapseButton = $( '#collapse-button' ),
+ ariaExpanded = 'true',
+ ariaLabelText = commonL10n.collapseMenu;
+
+ if ( 'folded' === eventData.state ) {
+ ariaExpanded = 'false';
+ ariaLabelText = commonL10n.expandMenu;
+ }
+
+ $collapseButton.attr({
+ 'aria-expanded': ariaExpanded,
+ 'aria-label': ariaLabelText
+ });
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setMenuState();
</ins><span class="cx" style="display: block; padding: 0 10px"> currentMenuItemHasPopup();
</span><span class="cx" style="display: block; padding: 0 10px"> makeNoticesDismissible();
</span><span class="cx" style="display: block; padding: 0 10px"> aria_button_if_js();
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-admin/menu-header.php 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,9 +234,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</li>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
- echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
- echo '</li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<li id="collapse-menu" class="hide-if-no-js">' .
+ '<button type="button" id="collapse-button" aria-label="' . esc_attr__( 'Collapse Main menu' ) . '" aria-expanded="true">' .
+ '<span class="collapse-button-icon" aria-hidden="true"></span>' .
+ '<span class="collapse-button-label">' . __( 'Collapse menu' ) . '</span>' .
+ '</button></li>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpincludescsscustomizepreviewcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/customize-preview.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/customize-preview.css 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-includes/css/customize-preview.css 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> color: transparent;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</span><span class="cx" style="display: block; padding: 0 10px"> outline: none;
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 5;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,17 +49,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 5;
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #0085ba;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #0085ba;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-border-radius: 50%;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-radius: 50%;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 2px solid #fff;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: 0 2px 1px rgba(46,68,83,0.15);
</ins><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 2px 1px rgba(46,68,83,0.15);
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -moz-box;
+ display: -ms-flexbox;
</ins><span class="cx" style="display: block; padding: 0 10px"> display: flex;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ -webkit-flex-direction: row;
+ -moz-box-orient: horizontal;
+ -moz-box-direction: normal;
+ -ms-flex-direction: row;
</ins><span class="cx" style="display: block; padding: 0 10px"> flex-direction: row;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-pack: center;
+ -webkit-justify-content: center;
+ -moz-box-pack: center;
+ -ms-flex-pack: center;
</ins><span class="cx" style="display: block; padding: 0 10px"> justify-content: center;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ -moz-box-align: center;
+ -ms-flex-align: center;
</ins><span class="cx" style="display: block; padding: 0 10px"> align-items: center;
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-fill-mode: both;
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-fill-mode: both;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-duration: .4s;
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-duration: .4s;
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> pointer-events: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,10 +107,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> body.customize-partial-edit-shortcuts-shown .customize-partial-edit-shortcut button {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-name: customize-partial-edit-shortcut-bounce-appear;
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-name: customize-partial-edit-shortcut-bounce-appear;
</span><span class="cx" style="display: block; padding: 0 10px"> pointer-events: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body.customize-partial-edit-shortcuts-hidden .customize-partial-edit-shortcut button {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-name: customize-partial-edit-shortcut-bounce-disappear;
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-name: customize-partial-edit-shortcut-bounce-disappear;
</span><span class="cx" style="display: block; padding: 0 10px"> pointer-events: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,56 +126,138 @@
</span><span class="cx" style="display: block; padding: 0 10px"> left: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@-webkit-keyframes customize-partial-edit-shortcut-bounce-appear {
+ from, 20%, 40%, 60%, 80%, to {
+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ }
+ 0% {
+ opacity: 0;
+ -webkit-transform: scale3d(.3, .3, .3);
+ transform: scale3d(.3, .3, .3);
+ }
+ 20% {
+ -webkit-transform: scale3d(1.1, 1.1, 1.1);
+ transform: scale3d(1.1, 1.1, 1.1);
+ }
+ 40% {
+ -webkit-transform: scale3d(.9, .9, .9);
+ transform: scale3d(.9, .9, .9);
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: scale3d(1.03, 1.03, 1.03);
+ transform: scale3d(1.03, 1.03, 1.03);
+ }
+ 80% {
+ -webkit-transform: scale3d(.97, .97, .97);
+ transform: scale3d(.97, .97, .97);
+ }
+ to {
+ opacity: 1;
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @keyframes customize-partial-edit-shortcut-bounce-appear {
</span><span class="cx" style="display: block; padding: 0 10px"> from, 20%, 40%, 60%, 80%, to {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 0% {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.3, .3, .3);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.3, .3, .3);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 20% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1.1, 1.1, 1.1);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1.1, 1.1, 1.1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 40% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.9, .9, .9);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.9, .9, .9);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 60% {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1.03, 1.03, 1.03);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1.03, 1.03, 1.03);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 80% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.97, .97, .97);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.97, .97, .97);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> to {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1, 1, 1);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1, 1, 1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@-webkit-keyframes customize-partial-edit-shortcut-bounce-disappear {
+ from, 20%, 40%, 60%, 80%, to {
+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ }
+ 0% {
+ opacity: 1;
+ -webkit-transform: scale3d(1, 1, 1);
+ transform: scale3d(1, 1, 1);
+ }
+ 20% {
+ -webkit-transform: scale3d(.97, .97, .97);
+ transform: scale3d(.97, .97, .97);
+ }
+ 40% {
+ opacity: 1;
+ -webkit-transform: scale3d(1.03, 1.03, 1.03);
+ transform: scale3d(1.03, 1.03, 1.03);
+ }
+ 60% {
+ -webkit-transform: scale3d(.9, .9, .9);
+ transform: scale3d(.9, .9, .9);
+ }
+ 80% {
+ -webkit-transform: scale3d(1.1, 1.1, 1.1);
+ transform: scale3d(1.1, 1.1, 1.1);
+ }
+ to {
+ opacity: 0;
+ -webkit-transform: scale3d(.3, .3, .3);
+ transform: scale3d(.3, .3, .3);
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @keyframes customize-partial-edit-shortcut-bounce-disappear {
</span><span class="cx" style="display: block; padding: 0 10px"> from, 20%, 40%, 60%, 80%, to {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
</ins><span class="cx" style="display: block; padding: 0 10px"> animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 0% {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1, 1, 1);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1, 1, 1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 20% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.97, .97, .97);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.97, .97, .97);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 40% {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1.03, 1.03, 1.03);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1.03, 1.03, 1.03);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 60% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.9, .9, .9);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.9, .9, .9);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 80% {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(1.1, 1.1, 1.1);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(1.1, 1.1, 1.1);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> to {
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: scale3d(.3, .3, .3);
</ins><span class="cx" style="display: block; padding: 0 10px"> transform: scale3d(.3, .3, .3);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2016-11-04 15:53:01 UTC (rev 39140)
+++ trunk/src/wp-includes/script-loader.php 2016-11-04 16:01:24 UTC (rev 39141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,8 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'warnDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ),
- 'dismiss' => __( 'Dismiss this notice.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'warnDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ),
+ 'dismiss' => __( 'Dismiss this notice.' ),
+ 'collapseMenu' => __( 'Collapse Main menu' ),
+ 'expandMenu' => __( 'Expand Main menu' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>