From 9e110f8aed0db6cd9684421084e496e168d58c67 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 14 Nov 2016 17:01:30 +0000
Subject: [PATCH] Twenty Seventeen: Resolves focused controls hidden by the top
 menu.

When a page is scrolled, the top nav menu become fixed. Depending on the page content this caused issue where focused links or buttons may be hidden behind the  nav menu.

Props afercia, davidakennedy, Fencer04
Fixes #38476


Built from https://develop.svn.wordpress.org/trunk@39225


git-svn-id: http://core.svn.wordpress.org/trunk@39165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/assets/js/global.js | 4 ++--
 wp-includes/version.php                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/assets/js/global.js b/wp-content/themes/twentyseventeen/assets/js/global.js
index 3d893e17cd..fa29a19b79 100644
--- a/wp-content/themes/twentyseventeen/assets/js/global.js
+++ b/wp-content/themes/twentyseventeen/assets/js/global.js
@@ -27,7 +27,7 @@
 		resizeTimer;
 
 	// Ensure the sticky navigation doesn't cover current focused links.
-	$( '#content a, #colophon a' ).focus( function() {
+	$( 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]', '.site-content-contain' ).filter( ':visible' ).focus( function() {
 		if ( $navigation.hasClass( 'site-navigation-fixed' ) ) {
 			var windowScrollTop = $( window ).scrollTop(),
 				fixedNavHeight = $navigation.height(),
@@ -40,7 +40,7 @@
 			}
 
 			if ( offsetDiff < fixedNavHeight ) {
-				$( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 600 );
+				$( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 0 );
 			}
 		}
 	});
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 18188f7585..f0543a5559 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta3-39224';
+$wp_version = '4.7-beta3-39225';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.