Merge pull request #379 from Its-Aman-Yadav/revert-377-main

Revert "i have changed services section"
Its-Aman-Yadav · May 22, 2024 · 6d1e62e · 6d1e62e
2 parents 173c5fe + 0ae9820
commit 6d1e62e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/css/style.css b/css/style.css
@@ -809,7 +809,7 @@ div.card {
   font-weight: 700;
   letter-spacing: 1px;
   padding: 14px 36px;
-  margin-top: 65px;
+  margin-top: 62px;
   margin-right: 16px;
   -webkit-transition: all 0.4s ease-in-out;
   transition: all 0.4s ease-in-out;

diff --git a/index.html b/index.html
@@ -300,26 +300,6 @@
   <!-- Home Section -->
   <section class="home" id="home">
     <div class="container">
-<<<<<<< HEAD
-      <div class="row">
-
-        <div class="col-md-offset-2 col-md-8 col-sm-12">
-          <div class="home-thumb">
-            <h1 class="wow fadeInUp" data-wow-delay="0.4s">Hello, Villager</h1>
-            <h3 class="wow fadeInUp" data-wow-delay="0.6s">We are <strong>Open Source Village</strong> </h3>
-            <h3 class="wow fadeInUp" data-wow-delay="0.8s"><strong>Join </strong>our community now </h3>
-            <a href="https://discord.gg/mM9qFh2uZR" class="btn btn-lg btn-default smoothScroll wow fadeInUp"
-              data-wow-delay="1s">Join Discord<image src ="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSSzDzOJpiBR0fBAJIOjXtUqpW9H_G9jhuQNTohtYu7sA&s" style="height: 40px; width: 40px;margin-left: 15px;margin-right: 20px;margin-top:0px; margin-bottom: 0px; border-radius: 5px;"></image></a>
-
-              <a style="font-size: 20 px;" href="https://www.linkedin.com/company/open-source-village/" class="btn btn-lg btn-default smoothScroll wow fadeInUp"
-              data-wow-delay="1s"> Follow us on LinkedIn<image src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/LinkedIn_icon.svg/1024px-LinkedIn_icon.svg.png"style="height: 40px; width: 40px;margin-left: 15px;margin-right: 20px;margin-top:0px; margin-bottom: 0px;"></image></a>
-            <!-- <a href="#" data-toggle="modal" data-target="#modal1"
-              class="btn btn-lg btn-success smoothScroll wow fadeInUp" data-wow-delay="1.0s">JOIN NEWSLETTER</a> -->
-          </div> 
-          </div>
-
-        </div>
-=======
       <div class="home-thumb">
         <h1>Open Source Village</h1>
         <h1 class="wow fadeInUp" data-wow-delay="0.4s">Hello, Villager</h1>
@@ -333,7 +313,6 @@ <h3 class="wow fadeInUp" data-wow-delay="0.8s"><strong>Join </strong>our communi
           Follow us on LinkedIn
           <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/LinkedIn_icon.svg/1024px-LinkedIn_icon.svg.png" alt="LinkedIn">
         </a>
->>>>>>> 384f64a63e0e117723010dd132afaddcf701bedf
       </div>
     </div>
   </section>
@@ -387,11 +366,7 @@ <h1 class="wow fadeIn" data-wow-delay="0.2s">Our Mission</h1>
     <div class="service-container">
       <div class="row d-grid gap-3">
         <div class="col-md-4 col-sm-6 shadow-lg p-3 mb-5 bg-body-tertiary rounded s-cards">
-<<<<<<< HEAD
-          <div class="card wow fadeInUp" style="width: 18rem;height: 400px; background-color:white; border-radius: 8px; padding: 20px;" data-wow-delay="0.4s">
-=======
           <div class="card wow fadeInUp" style="width: 18rem; background-color:white; border-radius: 8px; padding: 20px;" data-wow-delay="0.4s">
->>>>>>> 384f64a63e0e117723010dd132afaddcf701bedf
             <div class="wow fadeIn" data-wow-delay="0.2s">
               <div class="card-heading">
                 <h3 class="heading-hover">Open learning</h3>
@@ -403,11 +378,7 @@ <h3 class="heading-hover">Open learning</h3>
           </div>
         </div>
         <div class="col-md-4 col-sm-6 shadow-lg p-3 mb-5 bg-body-tertiary rounded s-cards">
-<<<<<<< HEAD
-          <div class="card wow fadeInUp" data-wow-delay="0.8s" style="width: 18rem;height: 400px; background-color:white; border-radius: 8px; padding: 20px;">
-=======
           <div class="card wow fadeInUp" data-wow-delay="0.8s" style="width: 18rem; background-color:white; border-radius: 8px; padding: 20px;">
->>>>>>> 384f64a63e0e117723010dd132afaddcf701bedf
             <div class="wow fadeIn" data-wow-delay="0.2s">
               <div class="card-heading">
                 <h3 class="heading-hover">Network</h3>
@@ -419,11 +390,7 @@ <h3 class="heading-hover">Network</h3>
           </div>
         </div>
         <div class="col-md-4 col-sm-6 shadow-lg p-3 mb-5 bg-body-tertiary rounded s-cards">
-<<<<<<< HEAD
-          <div class="card wow fadeInUp" data-wow-delay="1.2s" style="width: 18rem;height: 400px; background-color:white; border-radius: 8px; padding: 20px;">
-=======
           <div class="card wow fadeInUp" data-wow-delay="1.2s" style="width: 18rem; background-color:white; border-radius: 8px; padding: 20px;">
->>>>>>> 384f64a63e0e117723010dd132afaddcf701bedf
             <div class="wow fadeIn" data-wow-delay="0.2s">
               <div class="card-heading">
                 <h3 class="heading-hover">Mentorship</h3>
@@ -436,10 +403,7 @@ <h3 class="heading-hover">Mentorship</h3>
         </div>
       </div>
       <div class="clearfix text-center col-md-12 col-sm-12">
-        <!-- <a href="https://discord.gg/mM9qFh2uZR" target="_blank" class="btn btn-default smoothScroll" style="margin-top: 50px;">JOIN DISCORD</a> -->
-        <a href="https://discord.gg/mM9qFh2uZR" class="btn btn-lg btn-default smoothScroll"
-              data-wow-delay="1s" style="margin-top: 50px;">Join Discord<image src ="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSSzDzOJpiBR0fBAJIOjXtUqpW9H_G9jhuQNTohtYu7sA&s" style="height: 40px; width: 40px;margin-left: 15px;margin-right: 20px;margin-top:0px; margin-bottom: 0px; border-radius: 5px;"></image></a>
-
+        <a href="https://discord.gg/mM9qFh2uZR" target="_blank" class="btn btn-default smoothScroll">JOIN DISCORD</a>
       </div>
     </div>
   </div>