Update src/app/page.tsx

Merge version_2 into main
2026-03-06 19:06:22 +00:00 · 2026-03-06 19:04:56 +00:00 · 2026-03-06 19:04:48 +00:00 · 2026-03-06 19:02:03 +00:00 · 2026-03-06 19:01:58 +00:00 · 2026-03-06 19:01:57 +00:00
3 changed files with 22 additions and 42 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,47 +1,28 @@
 import type { Metadata } from "next";
-import { Raleway } from "next/font/google";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
+import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";

-const raleway = Raleway({
-  variable: "--font-raleway",  subsets: ["latin"],
+const geist = Geist({
+  variable: "--font-geist-sans",  subsets: ["latin"],
 });

-const halant = Halant({
-  variable: "--font-halant",  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "Derma | Nordic Luxury Skincare | Clean Beauty Science",  description: "Discover transformative Nordic skincare. Derma combines Scandinavian purity with cutting-edge dermatology. Clean, clinically tested, sustainably crafted for affluent conscious consumers.",  keywords: "luxury skincare, Nordic beauty, clean skincare, dermatology, sustainable beauty, premium skincare, skincare science",  openGraph: {
-    title: "Derma | Nordic Luxury Skincare Meets Scientific Innovation",    description: "Experience transformative skincare rooted in Nordic excellence and dermatological science.",    siteName: "Derma",    type: "website"},
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Derma | Nordic Science Meets Minimalist Luxury",  description: "Luxury Scandinavian skincare combining Nordic botanicals, clinical testing, and sustainability."};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${raleway.variable} ${halant.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1409,7 +1390,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -188,7 +188,7 @@ export default function DermaLanding() {
          sideDescription="Everything you need to know about Derma's science, sustainability, and skincare philosophy."
          faqs={[
            {
-              id: "1",              title: "What makes Derma different from other luxury skincare brands?",              content: "Derma combines Nordic botanical heritage with rigorous dermatological science. Every formula is clinically tested, transparently sourced, and sustainably produced. We prioritize efficacy, purity, and environmental responsibility equally."
+              id: "1",              title: "What makes Derma different from other luxury skincare brands?",              content: "<p>Derma combines three key differentiators that set us apart:</p><ul><li><strong>Nordic Botanicals:</strong> We harness potent Nordic plant extracts for superior efficacy and purity unmatched by other luxury brands.</li><li><strong>Clinical Testing:</strong> Every formula undergoes rigorous dermatological testing to deliver measurable, visible results proven in third-party studies.</li><li><strong>Sustainability:</strong> We prioritize environmental responsibility equally—minimal, recyclable packaging and ethically sourced ingredients ensure both skin and planet are cared for.</li></ul>"
            },
            {
              id: "2",              title: "Are your formulations clean and cruelty-free?",              content: "Yes. All Derma products are cruelty-free, vegan-friendly, and formulated without harmful chemicals. We're certified by Leaping Bunny and EcoCert, ensuring our commitment to ethical beauty."
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #f7f6f7;
-  --card: #ffffff;
-  --foreground: #250c0d;
-  --primary-cta: #b82b40;
-  --primary-cta-text: #f7f6f7;
-  --secondary-cta: #ffffff;
-  --secondary-cta-text: #250c0d;
-  --accent: #b90941;
-  --background-accent: #e8a8b6;
+  --background: #ffffff;
+  --card: #f9f9f9;
+  --foreground: #000f06e6;
+  --primary-cta: #0a7039;
+  --primary-cta-text: #ffffff;
+  --secondary-cta: #f9f9f9;
+  --secondary-cta-text: #000f06e6;
+  --accent: #e2e2e2;
+  --background-accent: #c4c4c4;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	1bc557c381	Update src/app/page.tsx	2026-03-06 19:06:22 +00:00
bender	7a5281d807	Merge version_2 into main Merge version_2 into main	2026-03-06 19:04:56 +00:00
bender	fbf08f14b0	Update theme colors	2026-03-06 19:04:48 +00:00
bender	5345b60616	Merge version_2 into main Merge version_2 into main	2026-03-06 19:02:03 +00:00
bender	cdf65615b8	Update src/app/page.tsx	2026-03-06 19:01:58 +00:00
bender	958e668bba	Update src/app/layout.tsx	2026-03-06 19:01:57 +00:00
bender	eca706b64e	Merge version_1 into main Merge version_1 into main	2026-03-06 18:04:59 +00:00