bender/ca36ab9a-542b-4dd2-9c19-22a106628f9a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-17 01:06:53 +00:00
Conversation 0 Commits 3 Files Changed 3 +12 -9
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -6,6 +6,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -14,8 +15,10 @@ export const metadata: Metadata = {
description: 'Get professional teeth whitening in 30 minutes with WhitePop Pro strips. Peroxide-free, enamel-safe formula. See results in 7 days. 30-day money-back guarantee.',
};
const publicSans = Public_Sans({
variable: "--font-public-sans", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
@@ -29,7 +32,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${poppins.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

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

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-public-sans), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

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

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #fffafa;
--card: #fff7f7;
--background: #ffffff;
--card: #f9f9f9;
--foreground: #1a0000;
--primary-cta: #e63946;
--primary-cta: #6b2d7d;
--primary-cta-text: #fffafa;
--secondary-cta: #ffffff;
--secondary-cta-text: #1a0000;
--accent: #f5c4c7;
--background-accent: #f09199;
--accent: #87ceeb;
--background-accent: #e6d5f0;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);