Merge branch 'testing'

This commit is contained in:
holger1411 2015-08-14 11:07:52 +02:00
commit c3ef213a5f
10 changed files with 77 additions and 26 deletions

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

View File

@ -6794,8 +6794,8 @@ body {
.wrapper {
padding: 30px 0; }
.wrapper#wrapper-hero {
padding: 0px; }
#wrapper-hero, #wrapper-static-hero {
padding: 0px !important; }
.sticky, .gallery-caption, .bypostauthor {
font-size: inherit; }

2
css/theme.min.css vendored
View File

@ -1554,7 +1554,7 @@ td.visible-print,th.visible-print{display:table-cell!important}
.fa,.fa-stack{display:inline-block}
body{padding-top:50px}
.wrapper{padding:30px 0}
.wrapper#wrapper-hero{padding:0}
#wrapper-hero,#wrapper-static-hero{padding:0!important}
.bypostauthor,.gallery-caption,.sticky{font-size:inherit}
.wrapper#wrapper-sticky{border-bottom:1px solid #eee}
/*!

View File

@ -13,16 +13,20 @@
<div class="container">
<div class="row">
<div class="col-md-12">
<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><!--col end -->
</div><!-- row end -->

View File

@ -30,18 +30,11 @@
<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; ?>
<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="col-xs-12">
<div class="navbar-header">

View File

@ -19,15 +19,16 @@ function understrap_widgets_init() {
'before_title' => '',
'after_title' => '',
) );
/*
register_sidebar( array(
'name' => __( 'Off Canvas', 'understrap' ),
'id' => 'off-canvas',
'name' => __( 'Static Hero', 'understrap' ),
'id' => 'statichero',
'description' => '',
'before_widget' => '<div class="col-md-12">',
'after_widget' => '</div>',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
) );*/
) );
}
add_action( 'widgets_init', 'understrap_widgets_init' );

View File

@ -15,6 +15,7 @@ get_header(); ?>
<?php get_template_part('hero'); ?>
<?php get_template_part('statichero'); ?>
<div class="wrapper" id="wrapper-index">

View File

@ -0,0 +1,41 @@
<?php
/**
* Template Name: Full Width Page
*
* Template for displaying a page without sidebar even if a sidebar widget is published
*
* @package understrap
*/
get_header(); ?>
<div class="wrapper" id="page-wrapper">
<div class="container">
<div id="primary" class="col-md-12 content-area">
<main id="main" class="site-main" role="main">
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', 'page' ); ?>
<?php
// If comments are open or we have at least one comment, load up the comment template
if ( comments_open() || get_comments_number() ) :
comments_template();
endif;
?>
<?php endwhile; // end of the loop. ?>
</main><!-- #main -->
</div><!-- #primary -->
</div><!-- Container end -->
</div><!-- Wrapper end -->
<?php get_footer(); ?>

View File

@ -7,8 +7,8 @@ body { padding-top: 50px; }
}
// Reset hero wrapper padding to 0
.wrapper#wrapper-hero {
padding:0px;
#wrapper-hero, #wrapper-static-hero {
padding:0px!important;
}
// Adding basic Wordpress classes to pass the Wordpress.org tests

11
statichero.php Normal file
View File

@ -0,0 +1,11 @@
<?php if ( is_active_sidebar( 'statichero' ) ): ?>
<!-- ******************* The Hero Widget Area ******************* -->
<div class="wrapper" id="wrapper-static-hero">
<?php dynamic_sidebar( 'statichero' ); ?>
</div>
<?php else : ?>
<?php endif; ?>