Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes #29

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Changes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
967b9f1
Final Merge (#26)
bj-jiwrajka Apr 13, 2024
c7eb80f
content change
rishinhk004 Apr 13, 2024
e39769b
Merge branch 'main' into changes
rishinhk004 Apr 13, 2024
ae346a9
fix
rishinhk004 Apr 13, 2024
d2225a3
Merge branch 'changes' of https://github.com/gdsc-nits-org/oikyotaan-…
rishinhk004 Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,31 @@
rel="icon"
type="icon"
href="https://res.cloudinary.com/dgnlmdkyq/image/upload/v1712640258/Oikyotaan/Group_1000006130_hxfncc.svg"
sizes="32*32"
/>
<link rel="preload"
as="image"
href="https://res.cloudinary.com/draptrzrc/image/upload/v1712487545/oikotan/hddpfhm9x3hv3slc89gl.webp">
<link rel="preload"
href="https://fonts.gstatic.com/s/poppins/v21/pxiEyp8kv8JHgFVrjJfecnFHGPc.woff2"
as="style" crossorigin="anonymous"
/>
sizes="32*32" />
<link rel="preload"
href="https://fonts.gstatic.com/s/snippet/v21/bWt47f7XfQH9Gupu6vjKfOh-UWY.woff2"
as="style" crossorigin="anonymous"
/>
as="image"
href="https://res.cloudinary.com/draptrzrc/image/upload/v1712487545/oikotan/hddpfhm9x3hv3slc89gl.webp">
<link rel="preload"
href="https://fonts.gstatic.com/s/montserrat/v26/JTUSjlg1_16t8kCHKm459WlhyyTh89Y.woff2"
as="style" crossorigin="anonymous"
/>

href="https://fonts.gstatic.com/s/poppins/v21/pxiEyp8kv8JHgFVrjJfecnFHGPc.woff2"
as="style" crossorigin="anonymous" />
<link rel="preload"
href="https://fonts.gstatic.com/s/snippet/v21/bWt47f7XfQH9Gupu6vjKfOh-UWY.woff2"
as="style" crossorigin="anonymous" />
<link rel="preload"
href="https://fonts.gstatic.com/s/montserrat/v26/JTUSjlg1_16t8kCHKm459WlhyyTh89Y.woff2"
as="style" crossorigin="anonymous" />

<title>Oikyotaan 2024</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id=G-BVJP7TQQ91"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-BVJP7TQQ91');
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions src/Components/Gallery/GalleryHeader/GalleryHeaderStyles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
}
}

@media screen and (max-width: 364px) {
@media screen and (max-width: 400px) {
.top {
scale: 0.8;
.header {
width: 33%;
width: 30%;
}
.heading {
white-space: break-spaces;
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Sponsors/SponsorHeading/SponsorHeadingStyles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
}

@media screen and (max-width: 364px) {
@media screen and (max-width: 400px) {
.top {
scale: 0.8;
}
Expand Down
5 changes: 3 additions & 2 deletions src/Pages/Artist/Artist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
"id":1,
"name":"Sneha Bhattacharjee",
"img":"https://res.cloudinary.com/dgnlmdkyq/image/upload/v1712904722/Oikyotaan/Rectangle_2_yucyk8.svg",
"about":"Sneha Bhattacharya, a talented singer, has made her mark in the music industry. She has lent her melodious voice to various musical albums, spanning genres like Indian Film Pop, Pop, and Bengali. Notably, Sneha participated in the prestigious reality show Sa Re Ga Ma Pa, where her performances garnered immense fame. Renowned for her dynamic vocals and stage charisma, Sneha's music resonates with themes of love and life, fostering unity and joy"
"about":"Don't miss the electrifying performance of the finalist of Sa Re Ga Ma Pa 2023, an Indian Pop sensation Sneha Bhattacharya at NIT Silchar on April 14, 2024, as part of Oikyotaan's Bengali New Year celebration! With her fusion of Pop and traditional Indian music, Sneha creates infectious rhythms that captivate audiences nationwide. Renowned for her dynamic vocals and stage charisma, Sneha's music resonates with themes of love and life, fostering unity and joy. Experience the magic of Sneha's original pop style, promising an unforgettable evening filled with vibrant melodies and irresistible beats. Join us for an extraordinary musical journey with Sneha Bhattacharya at Oikyotaan!"

},
{
"id":2,
"name":"The Folk Diaryz",
"img":"https://res.cloudinary.com/dgnlmdkyq/image/upload/v1712904723/Oikyotaan/Rectangle_1_y20cx4.svg",
"about":"The Folk Diaryz, a captivating band hailing from West Bengal (Kolkata), delves into the rich tapestry of Bengali folk music. With a perfect blend of traditional melodies and modern musical arrangements, they re-create old favorites like Lalon, Hason Raja, and Abdul Karim. Their reimagined renditions bridge the gap between generations, preserving the essence of Bengali folk music in a contemporary light."
"about":"Experience the enchanting fusion of Bengali folk melodies with modern musical arrangements by The Folk Diaryz, hailing from Kolkata, West Bengal. Join us at NIT Silchar on April 14, 2024, for Oikyotaan's Bengali New Year celebration, where The Folk Diaryz will breathe new life into traditional songs of Lalon, Hason Raja, Abdul Karim, Anusheh Anadil, and more. Their reimagined renditions bridge the gap between generations, preserving the essence of Bengali folk music in a contemporary light. Stay connected to their channel for captivating music videos and join us in keeping Bengali folk music alive and thriving!"
}
]