WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Seventeen: Make fixed navigation apply at correct height on front page, without header video or image 

Props laurelfulford, littlebigthing.

Merges [39392] to the 4.7 branch.
Fixes #38927 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39394


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2016-11-30 23:39:31 +00:00
parent 29e03dd26c
commit 02fa7656d1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-content/themes/twentyseventeen/template-parts/header/header-image.php
View File

@ -11,9 +11,11 @@
?> ?>
<div class="custom-header"> <div class="custom-header">
<?php if ( has_custom_header() ) : ?>
<div class="custom-header-image"> <div class="custom-header-image">
<?php the_custom_header_markup(); ?> <?php the_custom_header_markup(); ?>
</div> </div>
<?php endif; ?>
<?php get_template_part( 'template-parts/header/site', 'branding' ); ?> <?php get_template_part( 'template-parts/header/site', 'branding' ); ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-RC1-39391'; $wp_version = '4.7-RC1-39394';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.