Merge branch 'master' into testing
This commit is contained in:
commit
beedd83428
19
footer.php
19
footer.php
|
@ -11,16 +11,20 @@
|
|||
<div class="wrapper" id="wrapper-footer">
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<footer id="colophon" class="container site-footer" role="contentinfo">
|
||||
<footer id="colophon" class="container site-footer" role="contentinfo">
|
||||
|
||||
<div class="site-info">
|
||||
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
|
||||
<span class="sep"> | </span>
|
||||
<?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), 'understrap', '<a href="http://www.holgerkoenemann.de/" rel="designer">holgerkoenemann.de</a>' ); ?>
|
||||
</div><!-- .site-info -->
|
||||
<div class="site-info">
|
||||
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
|
||||
<span class="sep"> | </span>
|
||||
<?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), 'understrap', '<a href="http://www.holgerkoenemann.de/" rel="designer">holgerkoenemann.de</a>' ); ?>
|
||||
</div><!-- .site-info -->
|
||||
|
||||
</footer><!-- #colophon -->
|
||||
</footer><!-- #colophon -->
|
||||
|
||||
</div><!-- row end -->
|
||||
|
||||
</div><!-- container end -->
|
||||
|
||||
|
@ -33,7 +37,6 @@
|
|||
<!-- Loads slider script and settings if a widget on pos hero is published -->
|
||||
<?php if ( is_active_sidebar( 'hero' ) ): ?>
|
||||
|
||||
|
||||
<script>
|
||||
jQuery(document).ready(function() {
|
||||
var owl = jQuery('.owl-carousel');
|
||||
|
|
48
header.php
48
header.php
|
@ -28,36 +28,38 @@
|
|||
|
||||
<nav class="site-navigation" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
|
||||
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
|
||||
<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>
|
||||
<!-- Off Canvas Toggle -->
|
||||
<a class="off-canvas-toggle-link" data-toggle="offcanvas" data-target=".navmenu" data-canvas="body">
|
||||
menu
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>
|
||||
<!-- Off Canvas Toggle -->
|
||||
<a class="off-canvas-toggle-link" data-toggle="offcanvas" data-target=".navmenu" data-canvas="body">
|
||||
menu
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="container">
|
||||
<div class="container">
|
||||
|
||||
<div class="col-xs-<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>11<?php else : ?>12<?php endif; ?>">
|
||||
<div class="row">
|
||||
|
||||
<div class="navbar-header">
|
||||
<div class="col-xs-<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>11<?php else : ?>12<?php endif; ?>">
|
||||
|
||||
<!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<div class="navbar-header">
|
||||
|
||||
<!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</button>
|
||||
|
||||
<!-- Your site title as branding in the menu -->
|
||||
<a class="navbar-brand" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
|
||||
<!-- Your site title as branding in the menu -->
|
||||
<a class="navbar-brand" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- The WordPress Menu goes here -->
|
||||
<?php wp_nav_menu(
|
||||
<!-- The WordPress Menu goes here -->
|
||||
<?php wp_nav_menu(
|
||||
array(
|
||||
'theme_location' => 'primary',
|
||||
'container_class' => 'collapse navbar-collapse navbar-responsive-collapse',
|
||||
|
@ -66,11 +68,13 @@
|
|||
'menu_id' => 'main-menu',
|
||||
'walker' => new wp_bootstrap_navwalker()
|
||||
)
|
||||
); ?>
|
||||
); ?>
|
||||
|
||||
</div> <!-- .col-md-11 or col-md-12 end -->
|
||||
|
||||
</div> <!-- .container -->
|
||||
|
||||
</div> <!-- .row end -->
|
||||
|
||||
</div> <!-- .container -->
|
||||
|
||||
</div><!-- .navbar -->
|
||||
|
||||
|
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
@ -0,0 +1,24 @@
|
|||
<?php while (have_posts()) : the_post(); ?>
|
||||
<?php if (!is_sticky()) continue; ?>
|
||||
<!-- ******************* The Sticky Area ******************* -->
|
||||
<div class="wrapper" id="wrapper-sticky">
|
||||
<div class="container">
|
||||
<div class="col-md-12">
|
||||
<?php
|
||||
$sticky = get_option( 'sticky_posts' );
|
||||
$args = array(
|
||||
'posts_per_page' => 1,
|
||||
'post__in' => $sticky,
|
||||
'ignore_sticky_posts' => 1
|
||||
);
|
||||
$query = new WP_Query( $args );
|
||||
if ( isset($sticky[0]) ) {
|
||||
get_template_part( 'content', get_post_format() );
|
||||
}
|
||||
wp_reset_query();
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endwhile; ?>
|
||||
|
Reference in New Issue