fix -1

components/associations/association.module.css

@@ -32,8 +32,16 @@
   border-radius: 50%;
   /* background: linear-gradient(90deg, #00ccff, #98e8fc); */
   /* For Christmas Theme */
+/* <<<<<<< HEAD */
+/* <<<<<<< HEAD */
+  /* background: linear-gradient(90deg, #ffa776, #ffed79); */
+  /* opacity: 0.25; */
+/* ======= */
+/* ======= */
+/* >>>>>>> 9d6fd9a2231a8d40e12376dc7dd41750d85aa814 */
   background: linear-gradient(90deg, #ffa776, #ffed79);
   opacity: 0.25;
+/* >>>>>>> a2df487 (Updated: Events Poster) */
 }
 
 .associationMenuItem:hover::before {

components/button/Button.module.css

@@ -16,19 +16,29 @@
   /* background: rgb(51, 121, 238); */
   /* background: radial-gradient(circle, rgba(51, 121, 238, 1) 0%, rgba(36, 172, 255, 1) 100%); */
   /* For Christmas Theme */
+/* <<<<<<< HEAD */
+/* <<<<<<< HEAD */
+  /* background: #ffed79; */
+  /* background: radial-gradient(circle, #ffa776 0%, #ffed79, 100%); */
+/* ======= */
   background: #ffed79;
   background: radial-gradient(circle, #ffa776 0%, #ffed79, 100%);
+/* >>>>>>> a2df487 (Updated: Events Poster) */
+/* ======= */
+  background: #ffed79;
+  background: radial-gradient(circle, #ffa776 0%, #ffed79, 100%);
+/* >>>>>>> 9d6fd9a2231a8d40e12376dc7dd41750d85aa814 */
   transition: width 0.5s, height 0.5s;
 }
 
 .rippleButton:hover {
   border-color: transparent;
 }
 /* Below span tag styling is For christmas Theme */
-.rippleButton:hover > span {
+/* .rippleButton:hover > span {
   transition: 150ms;
   @apply text-primary;
-}
+} */
 
 .rippleButton:hover::before {
   height: 400px;

components/teams/Team.module.css

@@ -3,18 +3,39 @@
   min-height: 350px;
   /* background: rgb(0, 204, 255); */
   /* For christmas theme */
+/* <<<<<<< HEAD */
+/* <<<<<<< HEAD */
+  /* background: rgb(255, 237, 121);
+=======
+  /* background: rgb(255, 237, 121); */
+/* >>>>>>> a2df487 (Updated: Events Poster) */
+/* ======= */
   background: rgb(255, 237, 121);
+/* >>>>>>> 9d6fd9a2231a8d40e12376dc7dd41750d85aa814 */
   background: linear-gradient(
     45deg,
     rgba(255, 237, 121, 0.44861694677871145) 0%,
     rgba(253, 244, 186, 0.4) 100%
   );
+/* <<<<<<< HEAD */
+   /* background: linear-gradient(
+    45deg,
+    rgba(0, 204, 255, 0.44861694677871145) 0%,
+    rgba(152, 232, 252, 0.4) 100%
+  ); */
+/* <<<<<<< HEAD */
+  transition: all 300ms ease-in-out;
+/* ======= */
+  transition: all 300ms ease-in-out;
+/* >>>>>>> a2df487 (Updated: Events Poster) */
+/* ======= */
   /* background: linear-gradient(
     45deg,
     rgba(0, 204, 255, 0.44861694677871145) 0%,
     rgba(152, 232, 252, 0.4) 100%
   );
   transition: all 300ms ease-in-out;*/
+/* >>>>>>> 9d6fd9a2231a8d40e12376dc7dd41750d85aa814 */
 } 
 
 .cardContainer {

components/video/Video.module.css

@@ -3,8 +3,16 @@
   height: 90vh;
   @apply sm:h-auto;
   /* For christmas theme */
+/* <<<<<<< HEAD */
+/* <<<<<<< HEAD */
+  /* background: url('../../assets/christmas_theme/background3.png'); */
+  /* background-size: cover; */
+/* ======= */
+/* ======= */
+/* >>>>>>> 9d6fd9a2231a8d40e12376dc7dd41750d85aa814 */
   background: url('../../assets/christmas_theme/background3.png');
   background-size: cover;
+/* >>>>>>> a2df487 (Updated: Events Poster) */
 }
 
 .GRADIENT {

lib/data/FaqData.js

@@ -17,8 +17,8 @@ const options = [
     title: <>Who is the Professor-In-Charge of HnCC ?</>,
     body: (
       <>
-        The Professor-In-Charge of HnCC is Mr. Dinesh Kumar Prabhakar Sir from
-        the Dept. of Information Technology, BIT Sindri.
+        The Professor-In-Charge of HnCC is Prof. Md. Akram Khan Sir from the
+        Dept. of Information Technology, BIT Sindri.
       </>
     ),
   },
@@ -91,7 +91,7 @@ const options = [
           <li>Graphics Design</li>
           <li>Machine Learning and Deep Neural Networks</li>
           <li>API’s, backend and Cloud Computing</li>
-          <li>Management.</li>
+          <li>Blockchain</li>
         </ul>
       </>
     ),
@@ -192,8 +192,8 @@ const options = [
   {
     title: (
       <>
-        I got rejected in Interview but I want to join the Developer’s community
-        i.e. HnCC. What should I do now ?
+        I got rejected in Interview but I want to join the HnCC. What should I
+        do now ?
       </>
     ),
     body: (
@@ -323,6 +323,7 @@ const options = [
           <li>Sports Club</li>
           <li>Prayaas India</li>
           <li>Sarjana</li>
+          <li>Light Sindri</li>
         </ul>
         If your club is not in the list and you feel it should be here. Please
         contact and ask us for a review.
@@ -715,10 +716,15 @@ const options = [
     body: (
       <ul>
         <li>Hackathon (HACKATRON)</li>
-        <li>Developer of the Year (DOTY)</li>
-        <li>CodeStorm</li>
+        <li>Hackoverse</li>
+        <li>War of Web</li>
+        <li>CodeQuest</li>
+        <li>Uxathon</li>
+        <li>CodeCamp</li>
+        <li>Hacktrail</li>
         <li>Bit Code (Monthly Coding Contest)</li>
-        <li>HacktoberFest</li>
+        <li>Linux Installation Drive</li>
+        <li>Git and Github Session</li>
       </ul>
     ),
   },
@@ -731,20 +737,24 @@ const options = [
             We organized the first-ever national-level hackathon, Hackatron,
             ever in BIT Sindri.
           </li>
+
           <li>
-            Two of our members from 3rd year, Suraj Mahto(IT) and Anjani
-            Kumar(IT) hold developer status in the KDE Community.
+            Ruma Karn from our team has landed a Software Engineering internship
+            at Microsoft—a proud achievement for us!
           </li>
           <li>
-            Recently, our android team (lead by Shivam Anand and Anubhaw Sharma)
-            had taken part in a National Hackathon, in which they were currently
-            got into finals with 6th rank.
+            Soumik Kumar Ghosal from our team has secured a research internship
+            at Mitacs Globalink, Canada
           </li>
-          <li>We have a record high of 20.5k downloads on Play Store</li>
           <li>
-            A team from HnCC won the 1st prize in COVIDTHON organized by Govt.
-            of Jharkhand
+            Team SIGMA from our club, consisting of five team members conquered
+            at SIH Grand Finale&apos;23{' '}
           </li>
+          <li>
+            Team Programmarix from our club, consisting of five members, emerged
+            as the runner-up at the SIH Grand Finale&apos;22
+          </li>
+          <li>We have a record high of 20.5k downloads on Play Store</li>
         </ul>
         This are some of the recent achievements.
       </>
@@ -781,9 +791,9 @@ const options = [
         it might have been powered by a Linux system.
         <br />
         <strong>For a student, learning is the most important</strong>.<br />
-        Closed systems like Windows and Mac don’t provide that degree of open
-        environment and hackable features like you get on a Linux system which
-        is most important for learning and experimenting.
+        Closed systems like Windows and Mac don&apos;t provide that degree of
+        open environment and hackable features like you get on a Linux system
+        which is most important for learning and experimenting.
         <br />
         You can read more about the experience of having Linux OS, on the blog
         written by one of our 2nd-year member, Zeeshan Ashraf (ECE) at{' '}