development/bca5b0b3-29c4-4d1b-8690-6f77c16be459
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

8 Commits
version_1 ... main

Author SHA1 Message Date
development
f4da592bb9 Merge version_4 into main 
Merge version_4 into main
 2025-12-23 17:10:23 +00:00
development
c18ee45d69 Update src/app/page.tsx 2025-12-23 17:10:18 +00:00
development
6c2b70ac55 Merge version_3 into main 
Merge version_3 into main
 2025-12-23 17:08:03 +00:00
development
80d57aede1 Update src/app/globals.css 2025-12-23 17:07:59 +00:00
development
6cc9f02446 Merge version_2 into main 
Merge version_2 into main
 2025-12-23 16:56:47 +00:00
development
59977e958a Update src/app/page.tsx 2025-12-23 16:56:43 +00:00
development
e7d7cdf9a2 Update src/app/layout.tsx 2025-12-23 16:56:43 +00:00
development
d523f25df6 Update src/app/globals.css 2025-12-23 16:56:42 +00:00
3 changed files with 14 additions and 14 deletions
Expand all files Collapse all files

18
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #fcfcff;; --background: #ffffff;
--card: #fafaff;; --card: #fcfcfc;
--foreground: #150022;; --foreground: #120006e6;
--primary-cta: #7c3aed;; --primary-cta: #e63946;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;
--accent: #cfc2f0;; --accent: #e2e2e2;
--background-accent: #ba9bf1;; --background-accent: #c4c4c4;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-work-sans), sans-serif; font-family: var(--font-inter-tight), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-work-sans), sans-serif; font-family: var(--font-inter-tight), sans-serif;
} }

2
src/app/layout.tsx
View File

@@ -1276,4 +1276,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

8
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -79,7 +79,7 @@ export default function LandingPage() {
icon: Star icon: Star
} }
]} ]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766508754581-ac56mcoq.jpg" imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766509815693-6y70mpt0.jpg"
imageAlt="Star Wars fan community gathering" imageAlt="Star Wars fan community gathering"
/> />
</div> </div>
@@ -97,7 +97,7 @@ export default function LandingPage() {
{ {
title: "Episode Reviews", title: "Episode Reviews",
description: "In-depth analysis of every episode from all Star Wars series and films", description: "In-depth analysis of every episode from all Star Wars series and films",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766508755463-1pzweejz.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766509815952-mua84p9f.jpg",
imageAlt: "Episode reviews and analysis" imageAlt: "Episode reviews and analysis"
}, },
{ {
@@ -187,4 +187,4 @@ export default function LandingPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }