Solved bug, added arrows

apply.php

@@ -131,7 +131,7 @@
 	
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
 
-    <script type="text/javascript" src="scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="scripts/bootstrap.min.js"></script>
 	
 	<script  type="text/javascript" src="scripts/font-awesome.js"></script>

careers.php

@@ -226,7 +226,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="scripts/font-awesome.js"></script>
 

header.php

@@ -71,20 +71,20 @@
 					<?php	
 						if($isServices !== false)
 						{
-							echo '<li class="link service-link active"><a>Services</a> <span class="nav-active-mark"></span></li>';
+							echo '<li class="link service-link active"><i class="fa-angle-down"></i><a>Services</a> <span class="nav-active-mark"></span></li>';
 						}
 						else
 						{
-							echo '<li class="service-link"><a>Services</a></li>';
+							echo '<li class="service-link "><i class="fa-angle-down"></i><a>Services</a></li>';
 						}
 
 						if($isIndustries !== false)
 						{
-							echo '<li class="link industries-link active"><a>Industries</a> <span class="nav-active-mark"></span></li>  ';
+							echo '<li class="link industries-link active"><i class="fa-angle-down"></i><a>Industries</a> <span class="nav-active-mark"></span></li>  ';
 						}
 						else
 						{
-							echo '<li class="industries-link"><a>Industries</a></li>  ';
+							echo '<li class="industries-link"><i class="fa-angle-down"></i><a>Industries</a></li>  ';
 						}
 
 						if($pageName == 'careers.php' || $pageName == 'apply.php' )

index.php

@@ -1248,7 +1248,7 @@
 <!-- Scripts -->
 	<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
 	<!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-	<script type="text/javascript" src="scripts/popper.min.js"></script>
+	<!-- <script type="text/javascript" src="scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="scripts/bootstrap.min.js"></script>
 
 	<script type="text/javascript" src="scripts/jquery.easing.js"></script>
@@ -1261,7 +1261,7 @@
 	<script type="text/javascript" src="scripts/jquery.prettyPhoto.js"></script>
 	<script type="text/javascript" charset="utf-8" src="scripts/twitter/jquery.tweet.js"></script>
 	<script type="text/javascript" src="scripts/jquery.typed.js"></script>
-	<script type="text/javascript" src="teams/nicepage.js"></script>
+	<!-- <script type="text/javascript" src="teams/nicepage.js"></script> -->
 	<script type="text/javascript" src="scripts/custom.js"></script>
 	<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" ></script>
 	<script type="text/javascript">

industries/financeBanking.php

@@ -169,7 +169,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

industries/healthcare.php

@@ -167,7 +167,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

scripts/custom.js

@@ -93,13 +93,7 @@ jQuery(document).ready(function($){
     }
 
     //service and industry
-    var loc = window.location;
-    if(loc.pathname.includes("services") && loc.pathname.includes("industries") )
-    {
-        console.log(loc);
-        $(".expand-menu li a[href=" + + "]").addClass("active");
-       
-    }
+    
         
 
    //homepage
@@ -109,7 +103,7 @@ jQuery(document).ready(function($){
     $('#navigation .service-link').on('click', function()
     {
         
-        $(".nav-active-mark").parent().removeClass("active")
+        $(".nav-active-mark").parent().removeClass("active");
         $(".nav-active-mark").remove();
         
         $('#industriesMenu').css('display', 'none');
@@ -119,10 +113,19 @@ jQuery(document).ready(function($){
             if(previousLink != 'industries')
             {
                 $('#header').removeClass('active_dropdown');
+                //$(this).remove('.nav-active-mark').removeClass('active'); 
+                
+                backToPreviousLink();
+                previousLink = '';
+            }
+            else if(previousLink !== undefined)
+            {
+                $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+                previousLink = 'services'
+                //$(this).remove('.nav-active-mark').removeClass('active'); 
             }
-            $(this).remove('.nav-active-mark').removeClass('active');  
-            backToPreviousLink();
-            previousLink = '';
+            
+          
         }
         else
         {
@@ -137,7 +140,7 @@ jQuery(document).ready(function($){
     $('#navigation .industries-link').on('click', function()
     {
         
-        $(".nav-active-mark").parent().removeClass("active")
+        $(".nav-active-mark").parent().removeClass("active");
         $(".nav-active-mark").remove();
         
         $('#servicesMenu').css('display', 'none');
@@ -147,10 +150,18 @@ jQuery(document).ready(function($){
             if(previousLink != 'services')
             {
                 $('#header').removeClass('active_dropdown');
+                //$(this).remove('.nav-active-mark').removeClass('active');
+
+                backToPreviousLink();
+                  previousLink = '';
             }
-            $(this).remove('.nav-active-mark').removeClass('active'); 
-            backToPreviousLink();
-            previousLink = '';
+            else if(previousLink !== undefined)
+            {
+                //$(this).remove('.nav-active-mark').removeClass('active');
+                $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+                previousLink = 'industries'; 
+            }
+            
         }
         else
         {
@@ -565,7 +576,7 @@ jQuery(document).ready(function($){
 
     /*==========  Smooth Scroll  ==========*/
     $('a[href*=#]:not([href=#])').click(function() {
-        $("li.active").removeClass("active").find('.nav-active-mark').remove();
+        
         $("#navigation ul > li").each( function(index)
         {
             var selected  = $(this).find(".nav-active-mark");
@@ -573,7 +584,15 @@ jQuery(document).ready(function($){
             {
                 indexPeviousSelectedLink = index +1;                
             }
-        });    
+        });
+        $("li.active").removeClass("active").find('.nav-active-mark').remove();
+        if(!$(this).parent().hasClass('service-link') && !$(this).parent().hasClass('industries-link'))
+        {    
+            $('#servicesMenu').css('display', 'none');
+            $('#industriesMenu').css('display', 'none');
+            $('#header').removeClass('active_dropdown');
+
+        }
         $(this).parent().addClass('active').end().append('<span class="nav-active-mark"></span>');
             
         if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) {
@@ -664,14 +683,16 @@ jQuery(document).ready(function($){
     }
 
    
- /*==========  FlexSlider  ==========*/
-    $('.flexslider').flexslider({
-        animation: "fade",
-        animationLoop: false,
-        directionNav: false,
-        slideshow: false
-    });
-
+    /*==========  FlexSlider  ==========*/
+    if($('.flexslider').length)
+    {
+        $('.flexslider').flexslider({
+            animation: "fade",
+            animationLoop: false,
+            directionNav: false,
+            slideshow: false
+        });
+    }
    
 
 }); // end jquery init

scripts/popper.min.js.map

@@ -0,0 +1 @@
+{}

services/apiDevelopmentIntegration.php

@@ -169,7 +169,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

services/dedicatedDevelopmentTeam.php

@@ -167,7 +167,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

services/mobileApplicationDevelopment.php

@@ -168,7 +168,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

services/softwareTesting.php

@@ -168,7 +168,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

services/sofwareProductDevelopment.php

@@ -168,7 +168,7 @@
 	<!-- Scripts -->
     <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
     <!-- <script type="text/javascript" src="scripts/jquery-3.3.1.slim.min.js"></script> -->
-    <script type="text/javascript" src="../scripts/popper.min.js"></script>
+    <!-- <script type="text/javascript" src="../scripts/popper.min.js"></script> -->
 	<script type="text/javascript" src="../scripts/bootstrap.min.js"></script>
 	<script  type="text/javascript" src="../scripts/font-awesome.js"></script>
 

style.css

@@ -654,7 +654,7 @@ p .bold-team-info,
     font-family: 'bebas_neue', Helvetica, Arial, sans-serif;
     font-size: 17px;
     float: left;
-    padding-left: 26px;
+    margin-left: 26px;
     position: relative;
 }
 
@@ -676,8 +676,11 @@ p .bold-team-info,
     border-bottom-width: 10px;
     position: absolute;
     bottom: -18px;
-    left: 43%;
+    /*left: 43%;*/
+    left: 50%;
+    transform: translateX(-50%);
 }
+
 .link.active .nav-active-mark
 {
     bottom: -11px!important;

styles/custom.css

@@ -31,7 +31,21 @@ ul.bulleted-list {
 .service-link,.industries-link
 {
     cursor: pointer;
+    position: relative;
 }
+.service-link .fa-angle-down,.industries-link .fa-angle-down
+{  
+    position: absolute;
+    right: -17px;
+    top: 1px;
+    font-size: 17px;
+
+    transition: tranform .35s;
+}
+.service-link.active .fa-angle-down, .industries-link.active .fa-angle-down
+{
+    transform: rotate(180deg);
+} 
 .sub-menu
 {
     /* display: flex;