bender/c100b9b8-5c84-492d-a7a9-b428a0bc22d0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

13 Commits
version_2 ... main

Author SHA1 Message Date
bender
b25b3de3ca Merge version_3 into main 
Merge version_3 into main
 2026-04-11 15:07:56 +00:00
bender
98378fcad3 Update src/app/page.tsx 2026-04-11 15:07:50 +00:00
bender
bd47942237 Merge version_3 into main 
Merge version_3 into main
 2026-04-11 14:33:14 +00:00
bender
caeeb9aa10 Update theme fonts 2026-04-11 14:33:08 +00:00
bender
337d1623c3 Update theme fonts 2026-04-11 14:33:08 +00:00
bender
7f7c5c8706 Merge version_3 into main 
Merge version_3 into main
 2026-04-11 14:03:38 +00:00
bender
7efe44978a Update theme fonts 2026-04-11 14:03:35 +00:00
bender
91f2f87929 Update theme fonts 2026-04-11 14:03:34 +00:00
bender
2d18fb619f Merge version_3 into main 
Merge version_3 into main
 2026-04-11 14:03:27 +00:00
bender
be594c8da5 Update theme colors 2026-04-11 14:03:24 +00:00
bender
860584311b Merge version_2 into main 
Merge version_2 into main
 2026-04-11 14:02:51 +00:00
bender
9c5277b199 Merge version_1 into main 
Merge version_1 into main
 2026-04-11 13:51:06 +00:00
bender
b6b566140e Merge version_1 into main 
Merge version_1 into main
 2026-04-11 13:50:40 +00:00
4 changed files with 20 additions and 9 deletions
Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -7,6 +7,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
import { Public_Sans } from "next/font/google";
@@ -20,7 +22,16 @@ export const metadata: Metadata = {
}, },
}; };
const dmSans = DM_Sans({ variable: "--font-dm-sans", subsets: ["latin"] });
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
@@ -30,7 +41,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} antialiased`}> <body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

2
src/app/page.tsx
View File

@@ -46,7 +46,7 @@ export default function LandingPage() {
{ text: "Explore Now", href: "/discover" }, { text: "Explore Now", href: "/discover" },
{ text: "Connect Spotify", href: "/login" }, { text: "Connect Spotify", href: "/login" },
]} ]}
imageSrc="http://img.b2bpic.net/free-photo/green-optical-fiber-glass-light_23-2148241343.jpg" imageSrc="http://img.b2bpic.net/free-vector/music-live-concert-poster-flyer-template-design_1017-11414.jpg?id=1443907"
avatars={[ avatars={[
{ src: "http://img.b2bpic.net/free-photo/beautiful-optical-fiber-detail_23-2149182526.jpg", alt: "User avatar 1" }, { src: "http://img.b2bpic.net/free-photo/beautiful-optical-fiber-detail_23-2149182526.jpg", alt: "User avatar 1" },
{ src: "http://img.b2bpic.net/free-photo/abstract-blurred-green-background-with-bokeh-generative-ai_169016-30462.jpg", alt: "User avatar 2" }, { src: "http://img.b2bpic.net/free-photo/abstract-blurred-green-background-with-bokeh-generative-ai_169016-30462.jpg", alt: "User avatar 2" },

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-public-sans), sans-serif;
} }

8
src/app/styles/variables.css
View File

@@ -12,13 +12,13 @@
--background: #ffffff; --background: #ffffff;
--card: #f9f9f9; --card: #f9f9f9;
--foreground: #120006e6; --foreground: #120a00e6;
--primary-cta: #e63946; --primary-cta: #FF7B05;
--primary-cta-text: #ffffff; --primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9; --secondary-cta: #f9f9f9;
--secondary-cta-text: #120006e6; --secondary-cta-text: #120a00e6;
--accent: #e2e2e2; --accent: #e2e2e2;
--background-accent: #c4c4c4; --background-accent: #FF7B05;
/* 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);