Merge branch 'testing'

css/theme.css

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

css/theme.min.css

@@ -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}
 /*!

footer.php

@@ -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">
+                    <div class="site-info">
-                    <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
+                        <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
-                    <span class="sep"> | </span>
+                        <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>' ); ?>
+                        <?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><!-- .site-info -->
 
-            </footer><!-- #colophon -->
+                </footer><!-- #colophon -->
+
+            </div><!--col end -->
 
         </div><!-- row end -->
         

header.php

@@ -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">
 

inc/widgets.php

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

index.php

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

page-templates/fullwidthpage.php

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

sass/understrap/understrap.scss

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

statichero.php

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