rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix PR conflicts

This commit is contained in:
0dp 2018-06-26 10:23:51 +02:00
parent 0056613ae0 18d1841b5b
commit 81986ba7cd
15 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
footer.php
View File

@ -11,7 +11,7 @@ $the_theme = wp_get_theme();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
?> ?>
<?php get_sidebar( 'footerfull' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'footerfull' ); ?>
<div class="wrapper" id="wrapper-footer"> <div class="wrapper" id="wrapper-footer">

6
global-templates/hero.php
View File

@ -11,11 +11,11 @@
<div class="wrapper" id="wrapper-hero"> <div class="wrapper" id="wrapper-hero">
<?php get_sidebar( 'hero' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'hero' ); ?>
<?php get_sidebar( 'herocanvas' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'herocanvas' ); ?>
<?php get_sidebar( 'statichero' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'statichero' ); ?>
</div> </div>

2
global-templates/left-sidebar-check.php
View File

@ -12,7 +12,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
?> ?>
<?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
<?php get_sidebar( 'left' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
<?php endif; ?> <?php endif; ?>
<?php <?php

2
global-templates/right-sidebar-check.php
View File

@ -12,6 +12,6 @@
<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?> <?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
<?php get_sidebar( 'right' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
<?php endif; ?> <?php endif; ?>

6
package.json
View File

@ -46,7 +46,9 @@
"gulp-watch": "5.0.0", "gulp-watch": "5.0.0",
"merge2": "^1.2.1", "merge2": "^1.2.1",
"popper.js": "^1.14.1", "popper.js": "^1.14.1",
"rev-del": "1.0.5", "rev-del": "^1.0.5",
"undescores-for-npm": "^1.0.0" "undescores-for-npm": "^1.0.0",
"undescores-for-npm": "^1.0.0",
} }
} }

4
page-templates/both-sidebarspage.php
View File

@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<div class="row"> <div class="row">
<?php get_sidebar( 'left' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
<div <div
class="<?php class="<?php
@ -46,7 +46,7 @@ $container = get_theme_mod( 'understrap_container_type' );
</div><!-- #primary --> </div><!-- #primary -->
<?php get_sidebar( 'right' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
</div><!-- .row --> </div><!-- .row -->

2
page-templates/left-sidebarpage.php
View File

@ -17,7 +17,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<div class="row"> <div class="row">
<?php get_sidebar( 'left' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'left' ); ?>
<div <div
class="<?php if ( is_active_sidebar( 'left-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area" class="<?php if ( is_active_sidebar( 'left-sidebar' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area"

2
page-templates/right-sidebarpage.php
View File

@ -40,7 +40,7 @@ $container = get_theme_mod( 'understrap_container_type' );
</div><!-- #primary --> </div><!-- #primary -->
<?php get_sidebar( 'right' ); ?> <?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
</div><!-- .row --> </div><!-- .row -->

0
sidebar-footerfull.php → sidebar-templates/sidebar-footerfull.php
View File

0
sidebar-hero.php → sidebar-templates/sidebar-hero.php
View File

0
sidebar-herocanvas.php → sidebar-templates/sidebar-herocanvas.php
View File

2
sidebar-left.php → sidebar-templates/sidebar-left.php
View File

@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
<?php endif; ?> <?php endif; ?>
<?php dynamic_sidebar( 'left-sidebar' ); ?> <?php dynamic_sidebar( 'left-sidebar' ); ?>
</div><!-- #secondary --> </div><!-- #left-sidebar -->

2
sidebar-right.php → sidebar-templates/sidebar-right.php
View File

@ -20,4 +20,4 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
<?php endif; ?> <?php endif; ?>
<?php dynamic_sidebar( 'right-sidebar' ); ?> <?php dynamic_sidebar( 'right-sidebar' ); ?>
</div><!-- #secondary --> </div><!-- #right-sidebar -->

0
sidebar-statichero.php → sidebar-templates/sidebar-statichero.php
View File

17
sidebar.php
View File

@ -1,17 +0,0 @@
<?php
/**
* The sidebar containing the main widget area.
*
* @package understrap
*/
if ( ! is_active_sidebar( 'sidebar-1' ) ) {
return;
}
?>
<div class="col-md-4 widget-area" id="secondary" role="complementary">
<?php dynamic_sidebar( 'sidebar-1' ); ?>
</div><!-- #secondary -->