Merge branch 'master' of http://176.104.105.124:3000/diligent/diligent-site

header.php

@@ -197,7 +197,7 @@
 					<div class="dropdown-container">
 						<div class="row">
 							<div class="col-md-7 dropdown-half dropdown-left">
-								<img src='<?php echo $backToRoot; ?>images/services.jfif' >
+								<img src='<?php echo $backToRoot; ?>images/services.png' >
 							</div>
 							<div class="col-md-5 dropdown-half dropdown-right">
 								<ul class="expand-menu">

scripts/custom.js

@@ -94,8 +94,6 @@ jQuery(document).ready(function($){
 
     //service and industry
     
-        
-
    //homepage
    var previousLink;
    var indexPeviousSelectedLink = 0;
@@ -103,7 +101,7 @@ jQuery(document).ready(function($){
     $('#navigation .service-link').on('click', function()
     {
         
-        $(".nav-active-mark").parent().removeClass("active");
+        $(".nav-active-mark").parent().removeClass("active").removeClass('up');
         $(".nav-active-mark").remove();
         
         $('#industriesMenu').css('display', 'none');
@@ -120,18 +118,17 @@ jQuery(document).ready(function($){
             }
             else if(previousLink !== undefined)
             {
-                $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+                $(this).addClass('active').addClass("up").append('<span class="nav-active-mark"></span>');
                 previousLink = 'services'
                 //$(this).remove('.nav-active-mark').removeClass('active'); 
-            }
-            
+            }           
           
         }
         else
         {
 
             $('#header').addClass('active_dropdown');
-            $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+            $(this).addClass('active').addClass('up').append('<span class="nav-active-mark"></span>');
             previousLink = 'services';
         }
 
@@ -140,7 +137,7 @@ jQuery(document).ready(function($){
     $('#navigation .industries-link').on('click', function()
     {
         
-        $(".nav-active-mark").parent().removeClass("active");
+        $(".nav-active-mark").parent().removeClass("active").removeClass('up');
         $(".nav-active-mark").remove();
         
         $('#servicesMenu').css('display', 'none');
@@ -153,12 +150,12 @@ jQuery(document).ready(function($){
                 //$(this).remove('.nav-active-mark').removeClass('active');
 
                 backToPreviousLink();
-                  previousLink = '';
+                previousLink = '';
             }
             else if(previousLink !== undefined)
             {
                 //$(this).remove('.nav-active-mark').removeClass('active');
-                $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+                $(this).addClass('up').addClass('active').append('<span class="nav-active-mark"></span>');
                 previousLink = 'industries'; 
             }
             
@@ -166,7 +163,7 @@ jQuery(document).ready(function($){
         else
         {
             $('#header').addClass('active_dropdown');
-            $(this).addClass('active').append('<span class="nav-active-mark"></span>');
+            $(this).addClass('up').addClass('active').append('<span class="nav-active-mark"></span>');
             previousLink = 'industries';
         }
 

style.css

@@ -1786,13 +1786,13 @@ textarea.textarea-txt {
 {
     height: 22px;
     background-color: #993c95;
-    color: #fff;
+    color: #000;
     text-align: center;
     position: absolute;
     width: 100%;
     left: 0;
     bottom: 0;
-    }
+}
 #footer .widget {
     margin-bottom: 25px;
 }

styles/Udemy.txt

@@ -0,0 +1,8 @@
+Udemy
+
+office@dilig.net
+
+Diligent123@
+
+Application development and Integration
+https://www.google.com/search?q=software+testing++mockup+photography&tbm=isch&ved=2ahUKEwjr2s6L1PfsAhXTkKQKHasIDyYQ2-cCegQIABAA&oq=software+testing++mockup+photography&gs_lcp=CgNpbWcQA1DbOViQXWDHYGgBcAB4AIABiAGIAf4HkgEDNi40mAEAoAEBqgELZ3dzLXdpei1pbWfAAQE&sclient=img&ei=d1yqX6vDM9OhkgWrkbywAg&bih=912&biw=1920#imgrc=fRAoonv5Wcd2jM&imgdii=Bhdf0ZlNvBN9mM

styles/custom.css

@@ -41,7 +41,7 @@ ul.bulleted-list {
     font-size: 17px;
     transition: transform .35s;
 }
-.service-link.active .fa-angle-down, .industries-link.active .fa-angle-down
+.service-link.up.active .fa-angle-down, .industries-link.up.active .fa-angle-down
 {
     transform: rotate(180deg);
 } 
@@ -80,13 +80,16 @@ ul.bulleted-list {
 
 .expand-menu li
 {
-
     padding:5px 0px;
 }
 .expand-menu li a
 {
-    color:#fff; 
-
+    color:#fff;
+    transition: color .35s; 
+}
+.expand-menu li a:hover
+{
+    color:#993c95;
 }
 
 /* header end*/