Update 4 index.html

eshaagarwa · Jun 21, 2024 · f1c11e2 · f1c11e2
1 parent 2abea75
commit f1c11e2
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -34,7 +34,11 @@
                 <!-- ====================================== Side Menu ===================================== -->
                 <div class="side-menu">
                     <div class="profile-img-main">
+<<<<<<< HEAD
+                        <img class="zoom_in" src="assets/images/Esha_pic.png" alt="profile-img">
+=======
                         <img class="zoom_in" src="assets/images/profile-pic.png" alt="profile-img">
+>>>>>>> 2abea75ae2bd3fbd701f7aa46c53ac8200f207f9
                         <h1 class="fade_up">Esha <span>Agarwal</span></h1>
                         <h2 class="designer fade_up">Web Developer</h2>
                         <div class="profile-media-icons-main fade_up">
@@ -346,14 +350,22 @@ <h2 class="section-heading-text about-me fade_up">About Me.</h2>
     display: inline-block;
     padding: 10px 20px;
     margin-right: 10px;
+<<<<<<< HEAD
+    background-color:#00CC97;
+=======
     background-color: #007BFF;
+>>>>>>> 2abea75ae2bd3fbd701f7aa46c53ac8200f207f9
     color: #fff;
     text-decoration: none;
     border-radius: 5px;
 }
 
 .btn:hover {
+<<<<<<< HEAD
+    background-color:#FF759C;
+=======
     background-color: #cf17ad;
+>>>>>>> 2abea75ae2bd3fbd701f7aa46c53ac8200f207f9
 }
 
 
@@ -369,11 +381,19 @@ <h2 class="section-heading-text about-me fade_up">About Me.</h2>
                             Hi, my name is <span>Esha Agarwal</span> and Hello there! I'm a web designer, data analyst, software developer, and I'm very passionate and dedicated to my work. With experience as a professional, I have acquired the skills and knowledge necessary to make your project a success. I enjoy every step of the design process, as well as a software process from discussion and collaboration.
                         </p-->
                         <div class="about-content">
+<<<<<<< HEAD
+                            <!--div class="left-details">
+                                <img src="./assets/images/profile-pic.png" alt="Profile Picture" class="profile-pic">
+                                <div class="years"><span id="year">2</span> Years of Success</div>
+                                <div class="project"><span id="project">20</span> Total Project</div>
+                            </div-->
+=======
                             <div class="left-details">
                                 <img src="./assets/images/profile-pic.png" alt="Profile Picture" class="profile-pic">
                                 <!--div class="years"><span id="year">2</span> Years of Success</div>
                                 <div class="project"><span id="project">20</span> Total Project</div-->
                             </div>
+>>>>>>> 2abea75ae2bd3fbd701f7aa46c53ac8200f207f9
                             <div class="right-details">
                                 <h4>I'm a Software developer</h4>
                                 <h3>I Can Develop software and products</h3>