Merge branch 'master' of https://github.com/kansal15/blog

kansal15 · Jan 17, 2024 · b090169 · b090169
2 parents 8024d76 + 6befa0e
commit b090169
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+contact1.html
diff --git a/contact.html b/contact.html
@@ -1,5 +1,74 @@
 <!DOCTYPE html>
 <html lang="zxx">
+<<<<<<< HEAD
+
+<head>
+  <meta charset="utf-8">
+  <title>Gaurav Kansal Blog</title>
+
+  <!-- mobile responsive meta -->
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+  <!-- ** Plugins Needed for the Project ** -->
+  <!-- Bootstrap -->
+  <link rel="stylesheet" href="plugins/bootstrap/bootstrap.min.css">
+  <!-- slick slider -->
+  <link rel="stylesheet" href="plugins/slick/slick.css">
+  <!-- themefy-icon -->
+  <link rel="stylesheet" href="plugins/themify-icons/themify-icons.css">
+  <!-- Main Stylesheet -->
+  <link href="css/style.css" rel="stylesheet">
+
+  <!--Favicon-->
+  <link rel="icon" type="image/png" href="images/favicon.jpg">
+  <link href="css/fontawesome/css/all.min.css" rel="stylesheet" />
+
+</head>
+
+<body>
+  <!-- preloader -->
+  <div class="preloader">
+    <div class="loader">
+      <span class="dot"></span>
+      <div class="dots">
+        <span></span>
+        <span></span>
+        <span></span>
+      </div>
+    </div>
+  </div>
+  <!-- /preloader -->
+
+ <div class="navigation" id="myHead"></div>
+
+  <!-- page-title -->
+  <section class="section bg-secondary">
+    <div class="container">
+      <div class="row">
+        <div class="col-lg-12">
+          <h4>Contact Me</h4>
+        </div>
+      </div>
+    </div>
+  </section>
+  <!-- /page-title -->
+  <section class="section">
+    <div class="container">
+      <div class="row">
+        <div class="col-md-4">
+          <div class="text-center">
+            <div class="left-shape left-shape-svg left-text-palette-3-base left-shape-1">
+              <svg class="left-svg-link" preserveAspectRatio="none" viewBox="0 0 160 160" style="">
+                <use xlink:href="#svg-6487"></use>
+              </svg>
+              <svg class="left-svg-content" viewBox="0 0 160 160" x="0px" y="0px" id="svg-6487"
+                style="enable-background:new 0 0 160 160;">
+                <path
+                  d="M80,30c27.6,0,50,22.4,50,50s-22.4,50-50,50s-50-22.4-50-50S52.4,30,80,30 M80,0C35.8,0,0,35.8,0,80s35.8,80,80,80s80-35.8,80-80S124.2,0,80,0L80,0z">
+                </path>
+              </svg>
+=======
     <head>
         <meta charset="utf-8">
         <title>Gaurav Kansal Blog</title>
@@ -29,8 +98,25 @@
                     <span></span>
                     <span></span>
                 </div>
+>>>>>>> f8f81a926f3250ec1b8f4380bc63561f808cadc3
             </div>
         </div>
+<<<<<<< HEAD
+        <div class="col-md-8">
+          <div class="text-center rgt-block">           
+            <h3 class="profile-about-heading">Contact Details</h3>
+            <p class="u-align-center u-text u-text-2"> </p>
+            <div class="u-align-center u-border-3 u-border-palette-3-base u-line u-line-horizontal u-line-1"></div>
+            <h5 class="u-align-center u-custom-font u-font-montserrat u-text u-text-3 text-center">
+              <span>Website</span>: <a href="https://www.gauravkansal.in/" class="" target="_blank"> www.gauravkansal.in</a>
+              <br>
+              <span>Address</span>: <a href="" class="" target="_blank"> New Delhi, IN </a> <br>
+              <span>Email</span>: <a class="" target="_blank">
+                [email protected]</a>
+	      <span>Twitter</span>: <a href="https://x.com/kansal15" class="" target="_blank"> kansal15 </a> <br>
+            </h5>
+          </div>
+=======
         <!-- /preloader -->
 
         <div class="navigation" id="myHead"></div>
@@ -89,6 +175,7 @@ <h5 class="u-align-center u-custom-font u-font-montserrat u-text u-text-3 text-c
             <svg class="progress-circle svg-content" width="100%" height="100%" viewBox="-1 -1 102 102">
             <path d="M50,1 a49,49 0 0,1 0,98 a49,49 0 0,1 0,-98" />
             </svg>
+>>>>>>> f8f81a926f3250ec1b8f4380bc63561f808cadc3
         </div>
 
        <script src="plugins/jQuery/jquery.min.js" crossorigin="anonymous"></script>

diff --git a/footer.html b/footer.html
@@ -9,7 +9,7 @@
             <h6>Contact Info</h6>
             <ul class="list-unstyled">
               <li class="font-secondary"><b>Address:</b> New Delhi, IN</li>
-              <li class="font-secondary"><b>Mail:</b> gauravkansal@nic.in</li>
+              <li class="font-secondary"><b>Mail:</b> gaurav.kansal@nic.in</li>
             </ul>
           </div>
           <div class="col-md-4 col-sm-6 mb-4 mb-md-0">
@@ -27,4 +27,4 @@ <h6>Follow</h6>
     <div class="text-center pb-1">
       <p><b class="mb-0">© 2019-2023 Gaurav Kansal. All rights reserved</b></p>
     </div>
-  </footer>
+  </footer>