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

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

4 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
00d950e6f7 Update src/app/styles/variables.css 2026-03-17 01:06:49 +00:00
bender
6ec322a788 Update src/app/styles/base.css 2026-03-17 01:06:48 +00:00
bender
68a285e577 Update src/app/layout.tsx 2026-03-17 01:06:48 +00:00
bender
7785d8e92d Merge version_1 into main 
Merge version_1 into main
 2026-03-17 00:53:08 +00:00
3 changed files with 12 additions and 9 deletions
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 Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google"; 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.', 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({ const inter = Inter({
variable: "--font-inter", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
@@ -29,7 +32,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}> <body className={`${poppins.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { 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; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #fffafa; --background: #ffffff;
--card: #fff7f7; --card: #f9f9f9;
--foreground: #1a0000; --foreground: #1a0000;
--primary-cta: #e63946; --primary-cta: #6b2d7d;
--primary-cta-text: #fffafa; --primary-cta-text: #fffafa;
--secondary-cta: #ffffff; --secondary-cta: #ffffff;
--secondary-cta-text: #1a0000; --secondary-cta-text: #1a0000;
--accent: #f5c4c7; --accent: #87ceeb;
--background-accent: #f09199; --background-accent: #e6d5f0;
/* 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);