From b6090db83c791e1d193e42ae04704a8ee951568d Mon Sep 17 00:00:00 2001
From: Ayushraj_2804 <kreton2804@gmail.com>
Date: Sat, 5 Oct 2024 03:21:17 +0530
Subject: [PATCH] Resolved merge conflicts

---
 index.html | 20 +++++++++++++++++++-
 script.js  | 13 +++++++++++++
 style.css  | 11 ++---------
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 820b741..5cc6121 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,9 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
     
     <link rel="icon" href="images/favicon-removebg-preview.png">
+    <link
+        href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
+        rel="stylesheet">
 
     <link rel="stylesheet" href="style.css">
     <label for ="dark-mode-toggle">
@@ -155,7 +158,7 @@
         
     <input type="checkbox" name="" id="toggler">
     <label for="toggler" class="fas fa-bars"></label>
-    <a href="#" class="logo">Resum Resume<span>.</span></a>
+    <a href="#" class="logo" id=""><span id="newlogo"></span></a>
              
             <nav class="navbar">
                 <a href="#home">Home</a>
@@ -282,9 +285,24 @@ <h3>Connect With Us</h3>
         </div>
     </footer>
 
+
     <!-- Scripts -->
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.4/dist/umd/popper.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+    <script src="https://unpkg.com/typed.js@2.1.0/dist/typed.umd.js"></script>
+    <script>
+                
+        var typed = new Typed('#newlogo', {
+            
+            strings: ['EnhanCV.',"Build and shine!"],
+            loop: true,
+            typeSpeed: 80,
+            backSpeed: 25, // Speed for backspacing
+            backDelay: 1000, // Delay before starting to backspace
+            startDelay: 500 // Optional: Delay before starting the typing effect
+        });
+    
+    </script>
 </body>
 </html>
diff --git a/script.js b/script.js
index af753ca..d70de2e 100644
--- a/script.js
+++ b/script.js
@@ -80,4 +80,17 @@ document.addEventListener('DOMContentLoaded', () => {
             commentInput.value = ''; // Clear the input
         });
     });
+    
 });
+
+        
+// var typed = new Typed('#newlogo', {
+//     strings: ['EnhanCV.'],
+//     typeSpeed: 50,
+// });
+       
+  
+
+        
+       
+  
diff --git a/style.css b/style.css
index 6cc4be7..4ae9563 100644
--- a/style.css
+++ b/style.css
@@ -67,19 +67,12 @@ header{
 
 header .logo{
     font-size: 3rem;
-    color: #3f10ea;
-    font-weight: bolder;
-}
-header .logo:hover{
-    font-size: 3rem;
-    color: #f03c0b;
+    font-family: 'Poppins', sans-serif;
+    color: #353047;
     font-weight: bolder;
     text-decoration: none;
 }
 
-header .logo span{
-    color: var(--#2b1480);
-}
 
 header .navbar a{
     font-size: 2rem;