Merge remote-tracking branch 'origin/renewal'

# Conflicts:
#	inc/metaboxes/edit-template-page.php

404.php

@@ -12,10 +12,8 @@
 
 get_header(); ?>
 <main class="container">
- <?php _e( 'Oops! That page can&rsquo;t be found.', 'twentyseventeen' );
-
- _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyseventeen' );
-
- get_search_form(); ?>
+ <h1><?php _e( 'Oops! That page can&rsquo;t be found.', 'themestandard' ); ?></h1>
+ <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'themestandard' ); ?> </p>
+ <?php get_search_form(); ?>
 </main>
 <?php get_footer();

archive.php

@@ -13,27 +13,18 @@
 get_header(); ?>
 <main class="container">
 <?php
-if ( have_posts() ) :
- the_archive_title( '<h1 class="page-title">', '</h1>' );
- the_archive_description( '<div class="taxonomy-description">', '</div>' );
-endif;
+the_archive_title( '<h1 class="page-title">', '</h1>' );
+the_archive_description( '<div class="taxonomy-description">', '</div>' );
 
 if ( have_posts() ) :
 
- /* Start the Loop */
- while ( have_posts() ) :
- the_post();
+ while ( have_posts() ) : the_post();
 
  get_template_part( 'template-parts/content', get_post_format() );
 
  endwhile;
 
- the_post_navigation(
- array(
- 'prev_text' => __( 'Previous Post', 'twentyseventeen' ),
- 'next_text' => __( 'Next Post', 'twentyseventeen' ),
- )
- );
+ the_bootstrap_paginate_links();
 
 else :