From 1b05d1923fb040532fa03137f174039ddcf855b4 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 28 Jan 2016 09:31:56 -0500
Subject: [PATCH] removed active class from topLinks top-bar

---
 js/app.js              | 12 +++++++++---
 js/custom/pageSetup.js | 12 +++++++++---
 scss/_topbar.scss      |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/js/app.js b/js/app.js
index 8ede444..a2761d5 100644
--- a/js/app.js
+++ b/js/app.js
@@ -200,11 +200,12 @@ var extraDay, end, arrival, currentDate, currentDate2, requiredDate, requiredDat
     $(".menu-icon").on("click", function () {
        window.scrollTo(0,0);
     });
-    var $topMenu = $("ul#menu-top-menu li > a");
+    var $topMenu = $("ul#menu-menu-2 > li");
+    var $topMenuLink = $("ul#menu-top-menu li > a");
     var $dropDown = $("ul#menu-top-menu li").find(".dropdown");
     $("#headerLinks").children("ul#menu-top-menu").children("li").each(function () { 
-        $($topMenu).css("font-size", "16px");
-        $($topMenu).css("padding", "10px 5px");
+        $($topMenuLink).css("font-size", "16px");
+        $($topMenuLink).css("padding", "10px 5px");
     });
 //    var $placesToStay = $(".top-bar").find(".top-bar-section").children("ul#menu-main-menu").find("li.menu-item").eq(4);
 //    $placesToStay.on("click", function () {
@@ -212,4 +213,9 @@ var extraDay, end, arrival, currentDate, currentDate2, requiredDate, requiredDat
 //    });
 //    $placesToStay.find('.dropdown').css("min-width", "375px");
 //    $placesToStay.find('.dropdown').children("li").css("width", "100%");
+    
+    $($topMenu).each(function () {
+       $(this).removeClass("active") ;
+    });
+ 
 });
diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 8aad83a..0855cf4 100644
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -191,11 +191,12 @@ var extraDay, end, arrival, currentDate, currentDate2, requiredDate, requiredDat
     $(".menu-icon").on("click", function () {
        window.scrollTo(0,0);
     });
-    var $topMenu = $("ul#menu-top-menu li > a");
+    var $topMenu = $("ul#menu-menu-2 > li");
+    var $topMenuLink = $("ul#menu-top-menu li > a");
     var $dropDown = $("ul#menu-top-menu li").find(".dropdown");
     $("#headerLinks").children("ul#menu-top-menu").children("li").each(function () { 
-        $($topMenu).css("font-size", "16px");
-        $($topMenu).css("padding", "10px 5px");
+        $($topMenuLink).css("font-size", "16px");
+        $($topMenuLink).css("padding", "10px 5px");
     });
 //    var $placesToStay = $(".top-bar").find(".top-bar-section").children("ul#menu-main-menu").find("li.menu-item").eq(4);
 //    $placesToStay.on("click", function () {
@@ -203,4 +204,9 @@ var extraDay, end, arrival, currentDate, currentDate2, requiredDate, requiredDat
 //    });
 //    $placesToStay.find('.dropdown').css("min-width", "375px");
 //    $placesToStay.find('.dropdown').children("li").css("width", "100%");
+    
+    $($topMenu).each(function () {
+       $(this).removeClass("active") ;
+    });
+ 
 });
diff --git a/scss/_topbar.scss b/scss/_topbar.scss
index d9d4e68..9bfe02f 100644
--- a/scss/_topbar.scss
+++ b/scss/_topbar.scss
@@ -130,6 +130,7 @@
             }
         }
     }
+    
     & > ul > li {
         &:before {
             margin-top: 28px;
-- 
2.17.1