Merge branch 'master' into testing

This commit is contained in:
Holger Könemann 2015-08-12 17:21:59 +02:00
commit beedd83428
8 changed files with 61 additions and 30 deletions

0
404.php Executable file → Normal file
View File

0
archive.php Executable file → Normal file
View File

0
css/owl.carousel.css Executable file → Normal file
View File

View File

@ -12,6 +12,8 @@
<div class="container">
<div class="row">
<footer id="colophon" class="container site-footer" role="contentinfo">
<div class="site-info">
@ -22,6 +24,8 @@
</footer><!-- #colophon -->
</div><!-- row end -->
</div><!-- container end -->
</div><!-- wrapper 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');

View File

@ -39,6 +39,8 @@
<div class="container">
<div class="row">
<div class="col-xs-<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>11<?php else : ?>12<?php endif; ?>">
<div class="navbar-header">
@ -70,6 +72,8 @@
</div> <!-- .col-md-11 or col-md-12 end -->
</div> <!-- .row end -->
</div> <!-- .container -->
</div><!-- .navbar -->

0
screenshot.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
search.php Executable file → Normal file
View File

24
sticky.php Normal file
View File

@ -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; ?>