diff --git a/components/associations/association.module.css b/components/associations/association.module.css index 1af5a72..dab3a15 100644 --- a/components/associations/association.module.css +++ b/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 { diff --git a/components/button/Button.module.css b/components/button/Button.module.css index 5ce9a93..5ef72a4 100644 --- a/components/button/Button.module.css +++ b/components/button/Button.module.css @@ -16,8 +16,18 @@ /* 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; } @@ -25,10 +35,10 @@ 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; diff --git a/components/teams/Team.module.css b/components/teams/Team.module.css index 5592665..144f984 100644 --- a/components/teams/Team.module.css +++ b/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 { diff --git a/components/video/Video.module.css b/components/video/Video.module.css index 3984b81..7f7bc33 100644 --- a/components/video/Video.module.css +++ b/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 { diff --git a/lib/data/FaqData.js b/lib/data/FaqData.js index e089b39..4367320 100644 --- a/lib/data/FaqData.js +++ b/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 = [