removing searchFilter function from functions.php as it was preventing the

topbar from showing when the search GET was set to blog

diff --git a/functions.php b/functions.php
index 48f563d..52751ed 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -48,16 +48,16 @@ function glm_get_menu_options()
     return $menu_options;
 }
 
-function SearchFilter($query) {
-    if(isset($_GET['searchType'])) {
-        $searchType = $_GET['searchType'];
-        if ($searchType == 'blog' && !is_admin()) {
-            $query->set('post_type', 'post');
-        }
-    }
-    return $query;
-}
-add_filter('pre_get_posts','SearchFilter');
+//function SearchFilter($query) {
+//    if(isset($_GET['searchType'])) {
+//        $searchType = $_GET['searchType'];
+//        if ($searchType == 'blog' && !is_admin()) {
+//            $query->set('post_type', 'post');
+//        }
+//    }
+//    return $query;
+//}
+//add_filter('pre_get_posts','SearchFilter');
 add_theme_support('post-thumbnails');
 $defaults = array(
        'default-color'          => '',

diff --git a/parts/top-bar.php b/parts/top-bar.php
index a99ded2..f0a49db 100644 (file)
--- a/parts/top-bar.php
+++ b/parts/top-bar.php
@@ -8,3 +8,4 @@
         <a class="left-off-canvas-toggle menu-icon" href="#"><span>Menu</span></a>
     </section>
 </nav>
+

diff --git a/search.php b/search.php
index f550c74..8075934 100644 (file)
--- a/search.php
+++ b/search.php
@@ -1,17 +1,13 @@
 <?php get_header(); ?>
-<header>
-    <?php get_template_part('parts/top-bar_main');?>
-    <?php get_template_part('parts/head-image');?>
-    <?php get_template_part('parts/off-canvas_main');?>
-</header>
+
 <main class="search-results">
     <div id="content-wrapper">
       <div class="row">
        <?php if (is_search() && (isset($_GET['searchType']) && $_GET['searchType'] == 'blog') ){ ?>
-                    <div id="blog-posts-over" class="small-12 medium-9 columns">
-                <?php } else { ?>
-                    <div id="blog-posts-over" class="small-12 columns">
-                <?php } ?>
+            <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <?php } else { ?>
+            <div id="blog-posts-over" class="small-12 columns">
+        <?php } ?>
            <?php if (get_search_query() == "") { ?>
            <h2 class="search-result-header small-12 columns">Please enter a query in the search box. </h2>
            <?php } else { ?>