Skip to content

Commit

Permalink
Minorchanges (#19)
Browse files Browse the repository at this point in the history
* fixes

* link fix

* nav-bar added and footer fixes

* nav-bar added and footer fixes

* nav-bar added and footer fixes

* nav-bar added and footer fixes

* minor fix

* minor fix

* minor fix

* minor fix

* comments removed

* minor fixes and about sec add

* brochure add

* brochure add

* brochure add

* responsiveness fix

* minor fixes

* responsive fix and minor fixes

* minor fix

* minor fix

* minor fix

* NewEvents commit

* minor fix

* minor fix

* minor fix

* scroll fix

* scroll fix

* Events Page Added

* minor fixes and Event page fix

* minor fixes

* Events Fixed

* Loader task

* Loader added

* Loader added

* minor fixes

* minor fixes and favicon added

* minor fixes and favicon added

* logo changed

* logo changed

* minor fixes

* minor fixes

* favicon changed

* blur add

* blur add

* blur add

* gallery page fix

* scrollbar add

---------

Co-authored-by: Arindom <arindom956@gmail.com>
  • Loading branch information
2 people authored and bj-jiwrajka committed Apr 12, 2024
1 parent 39da59f commit ba9eed6
Show file tree
Hide file tree
Showing 21 changed files with 344 additions and 227 deletions.
2 changes: 1 addition & 1 deletion src/Components/About/AboutUs/AboutUs.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
width: 100vw;
padding-top: 0;
padding-bottom: 0;
margin-bottom: 0;
margin-bottom: 2rem;
max-height: max-content;
display: flex;
flex-direction: row;
Expand Down
34 changes: 20 additions & 14 deletions src/Components/Gallery/GalleryHeader/GalleryHeader.jsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
import './GalleryHeaderStyles.css'
import styles from './GalleryHeaderStyles.module.scss'
import Lottie from 'lottie-react'
import Dhol from "../../../Lottiefiles/drum right.json";
import rdrum from "../../../Lottiefiles/drum right.json";

const GalleryHeader = () => {
return (
<div className='header_container'>
<div className="drum_left">
<Lottie animationData={Dhol} loop/>
</div>
<div className='title_div'>
<p className='title'>Photo Gallery</p>
<img className='curl' src="https://res.cloudinary.com/dyn3q57b8/image/upload/f_auto,q_auto/v1/Oikyotaan%20'24%20assets/Sponsors/underline" alt="an underline" />
</div>
<div className="drum_right">
<Lottie animationData={Dhol} loop/>
</div>
</div>
<div className={styles.top}>
<div className={styles.inner}>
<div className={styles.ldrum}>
<Lottie animationData={rdrum} loop />
</div>
<div className={styles.header}>
<p className={styles.heading}>Photo Gallery</p>
<img
className={styles.logo}
src="https://res.cloudinary.com/dgnlmdkyq/image/upload/v1712169046/Oikyotaan/vecteezy_text-divider-calligraphic-ornament-vintage-decorations_11839102-removebg-preview_1_nro44d.svg"
alt="logo"
/>
</div>
<div className={styles.rdrum}>
<Lottie animationData={rdrum} loop />
</div>
</div>
</div>
)
}

Expand Down
64 changes: 0 additions & 64 deletions src/Components/Gallery/GalleryHeader/GalleryHeaderStyles.css

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
.top {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 0rem;
margin-bottom: 4rem;
height: fit-content;
max-width: 100vw;
margin-top: 3rem;
.inner {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0rem;
}
.header {
display: flex;
flex-direction: column;
align-items: center;
position: relative;
top: 2rem;
width: 50%;
justify-content: center;
flex-wrap: nowrap;
margin-left: 1rem;
margin-right: 1rem;
.logo {
height: 4.3rem;
width: 20rem;
}
}

.ldrum,
.rdrum {
height: 6rem;
width: 6rem;
}
.ldrum {
transform: scaleX(-1);
}
.heading {
text-align: center;
text-transform: uppercase;
color: #ffffff;
font-family: "Snippet", sans-serif;
white-space: nowrap;
font-weight: 700;
font-size: 2.2rem;
}
}

@media screen and (max-width:364px) {
.top{
scale: 0.8;
.header{
width: 33%;
}
.heading{
white-space: break-spaces;
}

}
}
2 changes: 1 addition & 1 deletion src/Components/Gallery/styles.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gallery-container {
margin-top: 8rem;
margin-top: 2rem;
}

@media (max-width: 768px) {
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Hero/Foreground.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Foreground = () => {
return (
<div className={styles.ForegroundSvg}>
<svg viewBox="0 0 3415 1252" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1147_129546)">
<g clipPath="url(#clip0_1147_129546)">
<path
d="M2218.66 797.871L2217.89 791.391L2213.48 796.194C2207.54 802.652 2204.01 810.274 2202.87 818.971C2188.96 874.61 2174.14 929.967 2158.42 985.047C2156.44 990.921 2156.06 996.308 2158.62 1000.41C2161.24 1004.61 2166.22 1006.35 2172.19 1006.61L2174.48 1006.72L2175.18 1004.53C2189.25 960.683 2201.43 916.257 2211.74 871.253C2214.13 863.749 2217.31 856.927 2221.24 850.771L2221.75 849.975L2221.71 849.031C2221.31 839.561 2222.95 830.441 2226.62 821.645L2227.24 820.163L2226.35 818.826C2222.12 812.48 2219.57 805.508 2218.66 797.871Z"
fill="#497F40"
Expand Down Expand Up @@ -8586,7 +8586,7 @@ const Foreground = () => {
d="M3001.67 772.705C3003.35 773.45 3003.44 774.189 3001.94 774.924C3001.34 774.226 3001.25 773.487 3001.67 772.705Z"
fill="#F5BD39"
/>
<g clip-path="url(#clip1_1147_129546)">
<g clipPath="url(#clip1_1147_129546)">
<path
fillRule="evenodd"
clipRule="evenodd"
Expand Down
34 changes: 20 additions & 14 deletions src/Components/Sponsors/SponsorHeading/SponsorHeading.jsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
import './SponsorHeadingStyles.css'
import styles from'./SponsorHeadingStyles.module.scss'
import Lottie from 'lottie-react'
import Dhol from "../../../Lottiefiles/drum right.json";
import rdrum from "../../../Lottiefiles/drum right.json";

const SponsorHeading = () => {
return (
<div className='header_container'>
<div className="drum_left">
<Lottie animationData={Dhol} />
</div>
<div className='title_div'>
<p className='title'>Sponsors</p>
<img className='curl' src="https://res.cloudinary.com/dyn3q57b8/image/upload/f_auto,q_auto/v1/Oikyotaan%20'24%20assets/Sponsors/underline" alt="an underline" />
</div>
<div className="drum_right">
<Lottie animationData={Dhol} />
</div>
</div>
<div className={styles.top}>
<div className={styles.inner}>
<div className={styles.ldrum}>
<Lottie animationData={rdrum} loop />
</div>
<div className={styles.header}>
<p className={styles.heading}>Sponsors</p>
<img
className={styles.logo}
src="https://res.cloudinary.com/dgnlmdkyq/image/upload/v1712169046/Oikyotaan/vecteezy_text-divider-calligraphic-ornament-vintage-decorations_11839102-removebg-preview_1_nro44d.svg"
alt="logo"
/>
</div>
<div className={styles.rdrum}>
<Lottie animationData={rdrum} loop />
</div>
</div>
</div>
)
}

Expand Down
59 changes: 0 additions & 59 deletions src/Components/Sponsors/SponsorHeading/SponsorHeadingStyles.css

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
margin-bottom: 4rem;
height: fit-content;
max-width: 100vw;
margin-top: 6rem;
.inner {
display: flex;
flex-direction: row;
Expand All @@ -20,7 +21,7 @@
align-items: center;
position: relative;
top: 2rem;
width: 33%;
width: 35%;
justify-content: center;
flex-wrap: nowrap;
margin-left: 1rem;
Expand All @@ -47,4 +48,10 @@
font-weight: 700;
font-size: 2.2rem;
}
}

@media screen and (max-width:364px) {
.top{
scale: 0.8;
}
}
7 changes: 2 additions & 5 deletions src/Components/Sponsors/SponsorsStyle.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
.container {
padding-top: 4rem;
padding-top:0;
margin-bottom: 4rem;
}

.SponsorCardContainer {
margin-top: 2rem;
}
}
1 change: 1 addition & 0 deletions src/Pages/Artist/Artist.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
width: 100%;
min-height: 100vh;
overflow: hidden;
padding-top: 3rem;
}
.top {
display: flex;
Expand Down
2 changes: 2 additions & 0 deletions src/Pages/Events/EventHeader.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
height: fit-content;
max-width: 100vw;
margin-top: 6rem;
padding-top: 2rem;

.inner {
display: flex;
flex-direction: row;
Expand Down
Loading

0 comments on commit ba9eed6

Please sign in to comment.