Skip to content

Commit b4b919a

Browse files
carlpinto25carlpinto25
authored
Merge pull request #39 from Chaithra0206/main
updated DK24 logo & alignment of logos
2 parents 76ebe5e + 9fc091a commit b4b919a

6 files changed

Lines changed: 76 additions & 66 deletions

File tree

‎apps/web/public/Consortium Logo.svg‎

Lines changed: 36 additions & 0 deletions
Loading

‎apps/web/src/components/CompletionScreen.tsx‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function CompletionScreen({
3535
<img
3636
src="/Fiza_logo.webp"
3737
alt="Fiza"
38-
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-2 -translate-y-24 sm:translate-x-4 sm:-translate-y-28"
38+
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-4 -translate-y-24 sm:translate-x-8 sm:-translate-y-28"
3939
/>
4040
</div>
4141

@@ -124,19 +124,17 @@ export default function CompletionScreen({
124124
Powered By
125125
</span>
126126
<a
127-
href="https://dk24.org/"
128-
target="_blank"
129-
rel="noopener noreferrer"
130-
className="flex items-center justify-center hover:opacity-80 transition-opacity"
131-
>
132-
<div className="w-20 h-20 shrink-0 overflow-hidden">
133-
<img
134-
src="/dk24.webp"
135-
alt="DK24"
136-
className="w-full h-full object-contain scale-125"
137-
/>
138-
</div>
139-
</a>
127+
href="https://dk24.org/"
128+
target="_blank"
129+
rel="noopener noreferrer"
130+
className="flex items-center justify-center gap-3 hover:opacity-80 transition-opacity"
131+
>
132+
<img
133+
src="/Consortium Logo.svg"
134+
alt="DK24"
135+
className="h-15 sm:h-15 w-auto object-contain"
136+
/>
137+
</a>
140138
</div>
141139

142140
{/* In Collaboration Section */}

‎apps/web/src/components/Footer.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ export default function Footer({
2828
href="https://dk24.org/"
2929
target="_blank"
3030
rel="noopener noreferrer"
31-
className="flex items-center justify-center cursor-pointer hover:opacity-80 transition"
31+
className="flex items-center justify-center gap-1.5 hover:opacity-80 transition-opacity mt-auto"
3232
>
33-
<div className="w-16 h-16 sm:w-20 sm:h-20 overflow-hidden">
34-
<img
35-
src="/dk24.webp"
36-
alt="DK24"
37-
className="w-full h-full object-contain"
38-
/>
39-
</div>
33+
<img
34+
src="/Consortium Logo.svg"
35+
alt="DK24"
36+
className="h-10 sm:h-12 w-auto object-contain"
37+
/>
4038
</a>
4139
</div>
4240

‎apps/web/src/components/LoginScreen.tsx‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,20 @@ export default function LoginScreen({ onStart }: LoginScreenProps) {
1111
className="h-[100dvh] relative select-none overflow-hidden flex flex-col bg-cover bg-center bg-no-repeat"
1212
style={{ backgroundImage: "url('/bg.webp')" }}
1313
>
14-
{/* ── TOP LOGOS ── */}
15-
<div className="absolute -top-4 left-5 right-5 flex items-center justify-between z-20 pointer-events-none">
16-
<motion.div
17-
initial={{ opacity: 0, y: -20 }}
18-
animate={{ opacity: 1, y: 0 }}
19-
transition={{ duration: 0.7 }}
20-
className="w-24 sm:w-32 md:w-36 drop-shadow-lg pointer-events-auto"
21-
>
14+
<div className="absolute top-4 left-6 sm:left-8 pointer-events-none z-30">
2215
<img
2316
src="/Nitte_logo.webp"
2417
alt="Nitte"
25-
className="w-full h-auto object-contain"
18+
className="h-10 sm:h-12 w-auto object-contain"
2619
/>
27-
</motion.div>
20+
</div>
2821

29-
<motion.div
30-
initial={{ opacity: 0, y: -20 }}
31-
animate={{ opacity: 1, y: 0 }}
32-
transition={{ duration: 0.7 }}
33-
className="w-24 sm:w-32 md:w-36 drop-shadow-lg pointer-events-auto"
34-
>
22+
<div className="absolute top-0 right-0 pointer-events-none z-30 opacity-90">
3523
<img
3624
src="/Fiza_logo.webp"
3725
alt="Fiza"
38-
className="w-full h-auto object-contain"
39-
/>
40-
</motion.div>
41-
</div>
42-
26+
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-4 -translate-y-24 sm:translate-x-8 sm:-translate-y-28" />
27+
</div>
4328
<div className="relative z-10 h-full flex flex-col items-center justify-center px-6">
4429

4530
{/* ── LOGO ── */}

‎apps/web/src/components/ProgressScreen.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default function ProgressScreen({
5555
<img
5656
src="/Fiza_logo.webp"
5757
alt="Fiza"
58-
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-2 -translate-y-24 sm:translate-x-4 sm:-translate-y-28"
58+
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-4 -translate-y-24 sm:translate-x-8 sm:-translate-y-28"
5959
/>
6060
</div>
6161

@@ -171,13 +171,11 @@ export default function ProgressScreen({
171171
rel="noopener noreferrer"
172172
className="flex items-center justify-center gap-3 hover:opacity-80 transition-opacity"
173173
>
174-
<div className="w-20 h-20 sm:w-24 sm:h-24 shrink-0 overflow-hidden">
175-
<img
176-
src="/dk24.webp"
174+
<img
175+
src="/Consortium Logo.svg"
177176
alt="DK24"
178-
className="w-full h-full object-contain scale-110"
177+
className="h-15 sm:h-15 w-auto object-contain"
179178
/>
180-
</div>
181179
</a>
182180
</div>
183181

‎apps/web/src/components/RatingScreen.tsx‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default function RatingScreen({ stallData, onSubmitSuccess }: RatingScree
5555
<img
5656
src="/Fiza_logo.webp"
5757
alt="Fiza"
58-
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-2 -translate-y-24 sm:translate-x-4 sm:-translate-y-28"
58+
className="h-60 sm:h-80 w-auto object-contain drop-shadow-[0_0_15px_rgba(255,255,255,0.1)] translate-x-4 -translate-y-24 sm:translate-x-8 sm:-translate-y-28"
5959
/>
6060
</div>
6161

@@ -199,22 +199,17 @@ export default function RatingScreen({ stallData, onSubmitSuccess }: RatingScree
199199
Powered By
200200
</span>
201201
<a
202-
href="https://dk24.org/"
203-
target="_blank"
204-
rel="noopener noreferrer"
205-
className="flex items-center justify-center gap-3 hover:opacity-80 transition-opacity"
206-
>
207-
<div className="w-20 h-20 sm:w-24 sm:h-24 shrink-0 overflow-hidden">
208-
<img
209-
src="/dk24.webp"
210-
alt="DK24"
211-
className="w-full h-full object-contain scale-110"
212-
/>
213-
</div>
214-
<span className="text-2xl sm:text-3xl font-black font-display tracking-tight whitespace-nowrap bg-gradient-to-r from-white via-white to-white/70 bg-clip-text text-transparent">
215-
216-
</span>
217-
</a>
202+
href="https://dk24.org/"
203+
target="_blank"
204+
rel="noopener noreferrer"
205+
className="flex items-center justify-center gap-3 hover:opacity-80 transition-opacity"
206+
>
207+
<img
208+
src="/Consortium Logo.svg"
209+
alt="DK24"
210+
className="h-15 sm:h-15 w-auto object-contain"
211+
/>
212+
</a>
218213
</div>
219214

220215
{/* In Collaboration Section */}

0 commit comments

Comments
 (0)