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

job_apply.php

@@ -57,7 +57,7 @@ $mail->Host = "mail.dilig.net";
 $mail->Port = 587;
 $mail->Username  = "contactus@dilig.net"; // SMTP username
 $mail->Password  = "contactus#dlgnt";     // SMTP password
-$mail->SetFrom($email, 'Nikola Ignjatovic');
+$mail->SetFrom($email, $name);
 $data = substr($resume, strpos($resume, ","));
 $filename = $resume_name; 
 $encoding = "base64"; 

style.css

@@ -373,8 +373,7 @@ p .bold-team-info,
 }
 #contact:not(.our_partners)
 {
-    /* padding-top: 0px; */
-    margin-top: -53px;
+	margin-top:-53px;
 }
 #about-section,
 #services-section,

styles/custom.css

@@ -68,6 +68,29 @@ ul.bulleted-list {
 
 /* header end*/
 
+<<<<<<< HEAD
+#back-to-top {
+	position: fixed;
+	right: 16px;
+	bottom: 40px;
+	width: 70px;
+	height: 50px;
+	display: none;
+	background-color: #993c95;
+	border-radius: 7px;
+	z-index: 99;
+}
+
+#back-to-top span {​​​​​​​​
+	position: relative;
+	top: 17px;
+	left: 29%;
+	font-size: 20px;
+	color: #fff;
+}​​​​​​​​
+
+
+=======
 #back-to-top
 {
     position: fixed;
@@ -88,6 +111,7 @@ ul.bulleted-list {
     font-size: 20px;
     color: #fff;
 }
+>>>>>>> 3c0307424f0b6fa253fce3c5b59486a4e578f613
 #back-to-top.active{
     display: block;
 }