From bdc253873e2080bb302c73d7436a32fe43a40f9c Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Aug 2019 16:59:18 -0400
Subject: [PATCH] Remove div container from displaying in the main nav

---
 js/custom/pageSetup.js | 26 +++++++++++++-------------
 lib/menu-walker.php    | 10 ++++++----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index d67b797..49e36af 100644
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -12,19 +12,19 @@ $(document).ready(function () {
         $(this).toggleClass('open');
         $(this).siblings('ul').toggleClass('open');
     });
-    $('.top-bar-section').find('ul.sub-menu.dropdown').each(function (){
-        var menuImg = $(this).parent('li').prop('id');
-        var menuNum = menuImg.match(/\d+/)[0];
-        var menuImgSrc = 'img_for_menu_' + menuNum;
-        if (window['img_for_menu_' + menuNum]) {
-            $(this).find('li.image-placeholder').html('<img src="' + eval(menuImgSrc) + '">');
-        } else {
-            $(this).find('li.image-placeholder').parent('ul').addClass('no-image-subul');
-            $(this).find('li.image-placeholder').remove();
-        }
-        //console.log('ul = ' + menuImg);
-        //console.log('menu-id = ' + menuNum);
-    });
+    // $('.top-bar-section').find('ul.sub-menu.dropdown').each(function (){
+    //     var menuImg = $(this).parent('li').prop('id');
+    //     var menuNum = menuImg.match(/\d+/)[0];
+    //     var menuImgSrc = 'img_for_menu_' + menuNum;
+    //     if (window['img_for_menu_' + menuNum]) {
+    //         $(this).find('li.image-placeholder').html('<img src="' + eval(menuImgSrc) + '">');
+    //     } else {
+    //         $(this).find('li.image-placeholder').parent('ul').addClass('no-image-subul');
+    //         $(this).find('li.image-placeholder').remove();
+    //     }
+    //     //console.log('ul = ' + menuImg);
+    //     //console.log('menu-id = ' + menuNum);
+    // });
 
     var blog = $("#blog-posts-over");
     $(blog).find(".search_result_context").find("br").remove();
diff --git a/lib/menu-walker.php b/lib/menu-walker.php
index fc6e4c6..1a62392 100644
--- a/lib/menu-walker.php
+++ b/lib/menu-walker.php
@@ -43,11 +43,12 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu {
     }
 
     function start_lvl( &$output, $depth = 0, $args = array() ) {
-        $output .= "\n<div class=\"dropdown-container\">\n<ul class=\"sub-menu dropdown\">\n";
+        //$output .= "\n<div class=\"dropdown-container\">\n<ul class=\"sub-menu dropdown\">\n";
+        $output .= "\n<ul class=\"sub-menu dropdown\">\n";
     }
 
     function end_lvl(&$output, $depth = 0, $args = array()){
-        $output .= '</ul></div>';
+        $output .= '</ul>';
     }
 }
 endif;
@@ -76,11 +77,12 @@ class Glm_Theme_Off_Canvas_Walker extends Walker_Nav_Menu {
     }
 
     function start_lvl( &$output, $depth = 0, $args = array() ) {
-        $output .= "\n<div class=\"dropdown-container\">\n<ul class=\"children\">\n";
+        //$output .= "\n<div class=\"dropdown-container\">\n<ul class=\"children\">\n";
+        $output .= "\n<ul class=\"children\">\n";
     }
 
     function end_lvl(&$output, $depth = 0, $args = array()){
-        $output .= '</ul></div>';
+        $output .= '</ul>';
     }
 }
 endif;
-- 
2.17.1