Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 07:45:02 +02:00
Code Issues Projects Releases Wiki Activity

Revert [38873]: Commit does not keep file history due to deleted directory

Browse Source 
The last commit to change directory structure for Twenty Seventee, didn't keep the file history so reverting in favour of doing that.

Props Ocean90

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


git-svn-id: http://core.svn.wordpress.org/trunk@38817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Tammie Lister 2016-10-23 12:23:41 +00:00
parent 552b119431
commit 05e4d10851
24 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-content/themes/twentyseventeen/archive.php
View File

@ -37,7 +37,7 @@ get_header(); ?>
* If you want to override this in a child theme, then include a file * If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Format name) and that will be used instead. * called content-___.php (where ___ is the Post Format name) and that will be used instead.
*/ */
get_template_part( 'template-parts/post/content', get_post_format() ); get_template_part( 'components/post/content', get_post_format() );
endwhile; endwhile;
@ -49,7 +49,7 @@ get_header(); ?>
else : else :
get_template_part( 'template-parts/post/content', 'none' ); get_template_part( 'components/post/content', 'none' );
endif; ?> endif; ?>

0
wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php → wp-content/themes/twentyseventeen/components/footer/footer-widgets.php
View File

0
wp-content/themes/twentyseventeen/template-parts/footer/site-info.php → wp-content/themes/twentyseventeen/components/footer/site-info.php
View File

4
wp-content/themes/twentyseventeen/template-parts/header/header-image.php → wp-content/themes/twentyseventeen/components/header/header-image.php
View File

@ -17,12 +17,12 @@
if ( ! empty( $header_image ) ) : ?> if ( ! empty( $header_image ) ) : ?>
<div class="custom-header-image" style="background-image: url(<?php echo esc_url( $header_image ); ?>)"></div> <div class="custom-header-image" style="background-image: url(<?php echo esc_url( $header_image ); ?>)"></div>
<?php get_template_part( 'template-parts/header/site', 'branding' ); ?> <?php get_template_part( 'components/header/site', 'branding' ); ?>
<?php else : ?> <?php else : ?>
<?php // Otherwise, show a blank header. ?> <?php // Otherwise, show a blank header. ?>
<div class="custom-header-simple"> <div class="custom-header-simple">
<?php get_template_part( 'template-parts/header/site', 'branding' ); ?> <?php get_template_part( 'components/header/site', 'branding' ); ?>
</div><!-- .custom-header-simple --> </div><!-- .custom-header-simple -->
<?php endif; ?> <?php endif; ?>

0
wp-content/themes/twentyseventeen/template-parts/header/site-branding.php → wp-content/themes/twentyseventeen/components/header/site-branding.php
View File

0
wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php → wp-content/themes/twentyseventeen/components/navigation/navigation-top.php
View File

2
wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php → wp-content/themes/twentyseventeen/components/page/content-front-page-panels.php
View File

@ -73,7 +73,7 @@ global $twentyseventeencounter;
<?php <?php
while ( $recent_posts->have_posts() ) : $recent_posts->the_post(); while ( $recent_posts->have_posts() ) : $recent_posts->the_post();
get_template_part( 'template-parts/post/content', 'excerpt' ); get_template_part( 'components/post/content', 'excerpt' );
endwhile; endwhile;
wp_reset_postdata(); wp_reset_postdata();
?> ?>

0
wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php → wp-content/themes/twentyseventeen/components/page/content-front-page.php
View File

0
wp-content/themes/twentyseventeen/template-parts/page/content-page.php → wp-content/themes/twentyseventeen/components/page/content-page.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-audio.php → wp-content/themes/twentyseventeen/components/post/content-audio.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php → wp-content/themes/twentyseventeen/components/post/content-excerpt.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php → wp-content/themes/twentyseventeen/components/post/content-gallery.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-image.php → wp-content/themes/twentyseventeen/components/post/content-image.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-none.php → wp-content/themes/twentyseventeen/components/post/content-none.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content-video.php → wp-content/themes/twentyseventeen/components/post/content-video.php
View File

0
wp-content/themes/twentyseventeen/template-parts/post/content.php → wp-content/themes/twentyseventeen/components/post/content.php
View File

4
wp-content/themes/twentyseventeen/footer.php
View File

@ -19,7 +19,7 @@
<footer id="colophon" class="site-footer" role="contentinfo"> <footer id="colophon" class="site-footer" role="contentinfo">
<div class="wrap"> <div class="wrap">
<?php <?php
get_template_part( 'template-parts/footer/footer', 'widgets' ); get_template_part( 'components/footer/footer', 'widgets' );
if ( has_nav_menu( 'social' ) ) : ?> if ( has_nav_menu( 'social' ) ) : ?>
<nav class="social-navigation" role="navigation" aria-label="<?php _e( 'Footer Social Links Menu', 'twentyseventeen' ); ?>"> <nav class="social-navigation" role="navigation" aria-label="<?php _e( 'Footer Social Links Menu', 'twentyseventeen' ); ?>">
@ -35,7 +35,7 @@
</nav><!-- .social-navigation --> </nav><!-- .social-navigation -->
<?php endif; <?php endif;
get_template_part( 'template-parts/footer/site', 'info' ); get_template_part( 'components/footer/site', 'info' );
?> ?>
</div><!-- .wrap --> </div><!-- .wrap -->
</footer><!-- #colophon --> </footer><!-- #colophon -->

8
wp-content/themes/twentyseventeen/front-page.php
View File

@ -20,10 +20,10 @@ get_header(); ?>
<?php // Show the selected frontpage content. <?php // Show the selected frontpage content.
if ( have_posts() ) : if ( have_posts() ) :
while ( have_posts() ) : the_post(); while ( have_posts() ) : the_post();
get_template_part( 'template-parts/page/content', 'front-page' ); get_template_part( 'components/page/content', 'front-page' );
endwhile; endwhile;
else : // I'm not sure it's possible to have no posts when this page is shown, but WTH. else : // I'm not sure it's possible to have no posts when this page is shown, but WTH.
get_template_part( 'template-parts/post/content', 'none' ); get_template_part( 'components/post/content', 'none' );
endif; ?> endif; ?>
<?php <?php
@ -31,7 +31,7 @@ get_header(); ?>
$panels = array( '1', '2', '3', '4' ); $panels = array( '1', '2', '3', '4' );
$titles = array(); $titles = array();
global $twentyseventeencounter; // Used in template-parts/page/content-front-page-panels.php file. global $twentyseventeencounter; // Used in components/page/content-front-page-panels.php file.
if ( 0 !== twentyseventeen_panel_count() || is_customize_preview() ) : // If we have pages to show. if ( 0 !== twentyseventeen_panel_count() || is_customize_preview() ) : // If we have pages to show.
@ -44,7 +44,7 @@ get_header(); ?>
set_query_var( 'panel', $panel ); set_query_var( 'panel', $panel );
$titles[] = get_the_title(); // Put page titles in an array for use in navigation. $titles[] = get_the_title(); // Put page titles in an array for use in navigation.
get_template_part( 'template-parts/page/content', 'front-page-panels' ); get_template_part( 'components/page/content', 'front-page-panels' );
wp_reset_postdata(); wp_reset_postdata();
else : else :

4
wp-content/themes/twentyseventeen/header.php
View File

@ -28,12 +28,12 @@
<header id="masthead" class="site-header" role="banner"> <header id="masthead" class="site-header" role="banner">
<?php get_template_part( 'template-parts/header/header', 'image' ); ?> <?php get_template_part( 'components/header/header', 'image' ); ?>
<?php if ( has_nav_menu( 'top' ) ) : ?> <?php if ( has_nav_menu( 'top' ) ) : ?>
<div class="navigation-top"> <div class="navigation-top">
<div class="wrap"> <div class="wrap">
<?php get_template_part( 'template-parts/navigation/navigation', 'top' ); ?> <?php get_template_part( 'components/navigation/navigation', 'top' ); ?>
</div><!-- .wrap --> </div><!-- .wrap -->
</div><!-- .navigation-top --> </div><!-- .navigation-top -->
<?php endif; ?> <?php endif; ?>

4
wp-content/themes/twentyseventeen/index.php
View File

@ -42,7 +42,7 @@ get_header(); ?>
* If you want to override this in a child theme, then include a file * If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Format name) and that will be used instead. * called content-___.php (where ___ is the Post Format name) and that will be used instead.
*/ */
get_template_part( 'template-parts/post/content', get_post_format() ); get_template_part( 'components/post/content', get_post_format() );
endwhile; endwhile;
@ -54,7 +54,7 @@ get_header(); ?>
else : else :
get_template_part( 'template-parts/post/content', 'none' ); get_template_part( 'components/post/content', 'none' );
endif; endif;
?> ?>

2
wp-content/themes/twentyseventeen/page.php
View File

@ -24,7 +24,7 @@ get_header(); ?>
<?php <?php
while ( have_posts() ) : the_post(); while ( have_posts() ) : the_post();
get_template_part( 'template-parts/page/content', 'page' ); get_template_part( 'components/page/content', 'page' );
// If comments are open or we have at least one comment, load up the comment template. // If comments are open or we have at least one comment, load up the comment template.
if ( comments_open() || get_comments_number() ) : if ( comments_open() || get_comments_number() ) :

2
wp-content/themes/twentyseventeen/search.php
View File

@ -35,7 +35,7 @@ get_header(); ?>
* If you want to overload this in a child theme then include a file * If you want to overload this in a child theme then include a file
* called content-search.php and that will be used instead. * called content-search.php and that will be used instead.
*/ */
get_template_part( 'template-parts/post/content', 'excerpt' ); get_template_part( 'components/post/content', 'excerpt' );
endwhile; // End of the loop. endwhile; // End of the loop.

2
wp-content/themes/twentyseventeen/single.php
View File

@ -20,7 +20,7 @@ get_header(); ?>
/* Start the Loop */ /* Start the Loop */
while ( have_posts() ) : the_post(); while ( have_posts() ) : the_post();
get_template_part( 'template-parts/post/content', get_post_format() ); get_template_part( 'components/post/content', get_post_format() );
// If comments are open or we have at least one comment, load up the comment template. // If comments are open or we have at least one comment, load up the comment template.
if ( comments_open() || get_comments_number() ) : if ( comments_open() || get_comments_number() ) :

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38873'; $wp_version = '4.7-alpha-38874';
/** /**
* 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.