Merge master
This commit is contained in:
6
page.php
6
page.php
@@ -1,2 +1,4 @@
|
|||||||
<?php get_template_part('templates/page', 'header'); ?>
|
<?php while (have_posts()) : the_post(); ?>
|
||||||
<?php get_template_part('templates/content', 'page'); ?>
|
<?php get_template_part('templates/page', 'header'); ?>
|
||||||
|
<?php get_template_part('templates/content', 'page'); ?>
|
||||||
|
<?php endwhile; ?>
|
||||||
|
|||||||
@@ -1,4 +1,2 @@
|
|||||||
<?php while (have_posts()) : the_post(); ?>
|
<?php the_content(); ?>
|
||||||
<?php the_content(); ?>
|
<?php wp_link_pages(array('before' => '<nav class="pagination">', 'after' => '</nav>')); ?>
|
||||||
<?php wp_link_pages(array('before' => '<nav class="pagination">', 'after' => '</nav>')); ?>
|
|
||||||
<?php endwhile; ?>
|
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
|
<a class="navbar-brand" href="<?php echo esc_url(home_url('/')); ?>/"><?php bloginfo('name'); ?></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav class="collapse navbar-collapse" role="navigation">
|
<nav class="collapse navbar-collapse" role="navigation">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<form role="search" method="get" class="search-form form-inline" action="<?php echo home_url('/'); ?>">
|
<form role="search" method="get" class="search-form form-inline" action="<?php echo esc_url(home_url('/')); ?>">
|
||||||
<label class="sr-only"><?php _e('Search for:', 'roots'); ?></label>
|
<label class="sr-only"><?php _e('Search for:', 'roots'); ?></label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
|
<input type="search" value="<?php echo get_search_query(); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
<button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>
|
<button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user