Merge version_14 into main

Update theme fonts
2026-04-07 17:05:41 +00:00 · 2026-04-07 17:05:38 +00:00 · 2026-04-07 17:05:37 +00:00 · 2026-04-07 17:05:32 +00:00 · 2026-04-07 17:05:29 +00:00 · 2026-04-07 17:05:28 +00:00
3 changed files with 29 additions and 15 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,9 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Montserrat } from "next/font/google";
+import { Open_Sans } from "next/font/google";
+import { Manrope } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -20,8 +23,15 @@ export const metadata: Metadata = {
  },
 };

-const montserrat = Montserrat({
-  variable: "--font-montserrat",
+
+
+
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
  subsets: ["latin"],
 });

@@ -33,7 +43,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${montserrat.variable} antialiased`}>
+        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
          
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -39,7 +39,7 @@ export default function LandingPage() {
        {
          name: "Besøg os",          id: "contact"},
      ]}
-      brandName="City Salon"
+      brandName="CITY SALON"
    />
  </div>

@@ -51,20 +51,20 @@ export default function LandingPage() {
      description="Du er ikke bare en kunde – du bliver husket. Kom ind, når det passer dig, og få den samme perfekte klipning, som får vores kunder til at vende tilbage år efter år."
      avatars={[
        {
-          src: "http://img.b2bpic.net/free-photo/business-man-phone-park_23-2148018595.jpg",          alt: "Kunde"},
+          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775575263554-kt3ffkmn.jpg",          alt: "Kunde"},
        {
-          src: "http://img.b2bpic.net/free-photo/lady-summer-cafe-woman-sitting-table-famale-with-cute-dog_1157-41816.jpg",          alt: "Kunde"},
+          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775576362014-fy3zcaoy.jpg",          alt: "Kunde"},
        {
-          src: "http://img.b2bpic.net/free-photo/closeup-portrait-sexy-handsome-fashion-male-model-man-dressed-elegant-suit-black-studio-lights-background_158538-9654.jpg",          alt: "Kunde"},
+          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775576366454-tfr25swc.jpg",          alt: "Kunde"},
        {
-          src: "http://img.b2bpic.net/free-photo/pleased-slavic-middle-aged-male-barber-uniform-holding-barber-tools-isolated-purple-wall_141793-91610.jpg",          alt: "Kunde"},
+          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775576405427-7arhr190.jpg",          alt: "Kunde"},
        {
-          src: "http://img.b2bpic.net/free-photo/this-is-so-cute-portrait-attractive-unshaven-young-male-with-muscular-tattoo-body-crossing-arms-his-chest-smiling-being-touched-by-something-expressing-distrust-suspicion-doubt_343059-1710.jpg",          alt: "Kunde"},
+          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775576410294-9oxi02hu.jpg",          alt: "Kunde"},
      ]}
      avatarText="Betroet af vores loyale stamkunder i over 6 år"
      buttons={[
        {
-          text: "Kom forbi i dag",          href: "https://www.google.com/maps/place/Fris%C3%B8r+i+Herning+%7C+City+Salon/@56.1362696,8.9678637,14z/data=!4m6!3m5!1s0x464bbbe5433dad53:0xcdf148b4e94181cc!8m2!3d56.1363651!4d8.9676575!16s%2Fg%2F11xgh0m52!5m1!1e1?entry=ttu&g_ep=EgoyMDI2MDQwMS4wIKXMDSoASAFQAw%3D%3D"},
+          text: "Find vej til salonen",          href: "https://www.google.com/maps/place/Fris%C3%B8r+i+Herning+%7C+City+Salon/@56.1362696,8.9678637,14z/data=!4m6!3m5!1s0x464bbbe5433dad53:0xcdf148b4e94181cc!8m2!3d56.1363651!4d8.9676575!16s%2Fg%2F11xgh0m52!5m1!1e1?entry=ttu&g_ep=EgoyMDI2MDQwMS4wIKXMDSoASAFQAw%3D%3D"},
      ]}
      buttonAnimation="slide-up"
      marqueeItems={[
@@ -84,6 +84,7 @@ export default function LandingPage() {
          type: "text-icon",          text: "Moderne studie",          icon: Star,
        },
      ]}
+      marqueeClassName="scale-150"
    />
  </div>

@@ -94,6 +95,9 @@ export default function LandingPage() {
      description="Hos City Salon tror vi på, at en god klipning handler om mere end bare frisuren – det handler om tillid. Vi har opbygget et ry for konsekvent kvalitet, der bringer vores kunder tilbage igen og igen. Når du træder ind ad døren, bliver du mødt af kendte ansigter og barberer, der virkelig lytter. Uanset om du er ny i kvarteret eller en af vores faste kunder, fortjener du en klipning, der afspejler din stil, og en oplevelse, der værdsætter din tid."
      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775575263554-kt3ffkmn.jpg"
      imageAlt="Professionelt salonmiljø"
+      buttons={[
+        { text: "Book din tid", href: "#contact" }
+      ]}
    />
  </div>

@@ -103,11 +107,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      features={[
        {
-          title: "Præcisionsarbejde",          description: "Ekspertteknikker der sikrer ensartede resultater af høj kvalitet ved hvert besøg.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775574107514-mjup70k8.jpg?_wi=1",          imageAlt: "Præcisionsværktøj"},
+          title: "Præcisionsarbejde",          description: "Ekspertteknikker der sikrer ensartede resultater af høj kvalitet ved hvert besøg.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775580400047-j71d0kh8.jpg",          imageAlt: "Præcisionsværktøj"},
        {
          title: "Imødekommende atmosfære",          description: "Et afslappet og professionelt miljø, hvor alle bliver behandlet som individer.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775574107514-mjup70k8.jpg?_wi=2",          imageAlt: "Salonstation"},
        {
-          title: "Personlig tilgang",          description: "Vi tager os tid til at lære din stil, dine præferencer og din hårtype at kende.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775573986291-ctps74sb.jpg",          imageAlt: "Stylingsession"},
+          title: "Personlig tilgang",          description: "Vi tager os tid til at lære din stil, dine præferencer og din hårtype at kende.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775580373535-8xkm6zou.jpg",          imageAlt: "Stylingsession"},
      ]}
      title="City Salon-forskellen"
      description="Premium kvalitet uden omsvøb. Hver klipning er en kunstart."
@@ -166,7 +170,7 @@ export default function LandingPage() {
        variant: "plain"}}
      tag="Besøg os"
      title="Kom forbi når du er klar"
-      description="Ingen tidsbestilling nødvendig. Bare mød op, så gør vi dig klar til at se bedst ud."
+      description="Ingen tidsbestilling nødvendig. Vi har åbent mandag-lørdag kl. 09-18 på Østergade 12, så bare mød op, så gør vi dig klar til at se bedst ud."
      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C1E0t8mxuGpZ0qBVz2J2MtoVjT/uploaded-1775575361403-xt5li2mn.jpg"
      imageAlt="Salonindgang"
      mediaAnimation="slide-up"
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }
Author	SHA1	Message	Date
bender	33e3ced761	Merge version_14 into main Merge version_14 into main	2026-04-07 17:05:41 +00:00
bender	71a0f7ff2e	Update theme fonts	2026-04-07 17:05:38 +00:00
bender	f13d2564cb	Update theme fonts	2026-04-07 17:05:37 +00:00
bender	9d5f5d79a4	Merge version_14 into main Merge version_14 into main	2026-04-07 17:05:32 +00:00
bender	b3da9a8912	Update theme fonts	2026-04-07 17:05:29 +00:00
bender	a1e4ad6a3d	Update theme fonts	2026-04-07 17:05:28 +00:00
bender	a85afba86c	Merge version_14 into main Merge version_14 into main	2026-04-07 17:02:04 +00:00
bender	d8e4340b06	Update theme fonts	2026-04-07 17:02:01 +00:00
bender	12e9e1e3f6	Update theme fonts	2026-04-07 17:02:01 +00:00
bender	103bbb0980	Merge version_14 into main Merge version_14 into main	2026-04-07 16:46:50 +00:00
bender	156c4a20d8	Update src/app/page.tsx	2026-04-07 16:46:44 +00:00
bender	2ec2d7e28c	Merge version_14 into main Merge version_14 into main	2026-04-07 16:46:22 +00:00
bender	c56d3dfb36	Update src/app/page.tsx	2026-04-07 16:46:19 +00:00
bender	ae82c126a8	Switch to version 14: modified src/app/page.tsx	2026-04-07 16:45:07 +00:00
bender	34b13712f2	Merge version_15 into main Merge version_15 into main	2026-04-07 16:45:02 +00:00
bender	596ef5e43b	Update src/app/page.tsx	2026-04-07 16:44:59 +00:00
bender	f26fcd95e2	Merge version_15 into main Merge version_15 into main	2026-04-07 15:48:55 +00:00
bender	3f3ec4570e	Update src/app/page.tsx	2026-04-07 15:48:51 +00:00
bender	d5148bdd17	Merge version_14 into main Merge version_14 into main	2026-04-07 15:42:25 +00:00
bender	18f1f6c414	Update src/app/page.tsx	2026-04-07 15:42:19 +00:00
bender	301ce8af4a	Merge version_13 into main Merge version_13 into main	2026-04-07 15:40:54 +00:00
bender	f69d7401a7	Update src/app/page.tsx	2026-04-07 15:40:51 +00:00
bender	c0fb565519	Merge version_12 into main Merge version_12 into main	2026-04-07 15:40:16 +00:00
bender	4afe7aad05	Update src/app/page.tsx	2026-04-07 15:40:12 +00:00
bender	afa3b9734c	Merge version_12 into main Merge version_12 into main	2026-04-07 15:37:49 +00:00
bender	261b7ecbb9	Update src/app/page.tsx	2026-04-07 15:37:46 +00:00
bender	d7934b0e09	Merge version_11 into main Merge version_11 into main	2026-04-07 15:36:25 +00:00
bender	b2aeecc407	Update src/app/page.tsx	2026-04-07 15:36:22 +00:00
bender	9cd8933e66	Merge version_10 into main Merge version_10 into main	2026-04-07 15:35:19 +00:00
bender	7cb8a54c7b	Update src/app/page.tsx	2026-04-07 15:35:16 +00:00
bender	2f6e112ee0	Merge version_9 into main Merge version_9 into main	2026-04-07 15:34:03 +00:00
bender	18d8236cb9	Update src/app/page.tsx	2026-04-07 15:34:00 +00:00
bender	43f6f0da02	Merge version_8 into main Merge version_8 into main	2026-04-07 15:32:03 +00:00
bender	3637a26c05	Update src/app/page.tsx	2026-04-07 15:32:00 +00:00
bender	e9f05f35e0	Merge version_7 into main Merge version_7 into main	2026-04-07 15:30:57 +00:00