bender/71e78a7b-6f5d-4e14-947c-e9f428ae0abc
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_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_2 bender:version_1

4 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
af4cc6e95d Update src/app/styles/variables.css 2026-03-04 18:18:56 +00:00
bender
76a3a19741 Update src/app/styles/base.css 2026-03-04 18:18:55 +00:00
bender
540804a18a Update src/app/layout.tsx 2026-03-04 18:18:55 +00:00
bender
ec8c0031b6 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 18:15:28 +00:00
3 changed files with 10 additions and 23 deletions
Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -1,24 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import { Raleway } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({ const inter = Inter({
variable: "--font-inter", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
const raleway = Raleway({
variable: "--font-raleway", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Mediame - Social Media Marketing Agency", description: "Transform your brand's social presence with strategic campaigns, creative content, and data-driven results. Trusted by leading brands.", keywords: "social media marketing, social media agency, digital marketing, content creation, social media strategy, paid advertising", robots: { title: "Mediame - Social Media Marketing Agency", description: "Transform your brand's social presence with strategic campaigns, creative content, and data-driven results. Trusted by leading brands.", keywords: "social media marketing, social media agency, digital marketing, content creation, social media strategy, paid advertising", robots: {
index: true, index: true,
@@ -43,9 +32,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${inter.variable} antialiased`}>
className={`${halant.variable} ${inter.variable} ${raleway.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}

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-raleway), 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-raleway), sans-serif; font-family: var(--font-inter), sans-serif;
} }

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #f5f4f0; --background: #ffffff;
--card: #ffffff; --card: #f0f7ff;
--foreground: #1a1a1a; --foreground: #001a4d;
--primary-cta: #2c2c2c; --primary-cta: #0052cc;
--primary-cta-text: #f5f4f0; --primary-cta-text: #f5f4f0;
--secondary-cta: #f5f4f0; --secondary-cta: #e6f0ff;
--secondary-cta-text: #1a1a1a; --secondary-cta-text: #1a1a1a;
--accent: #8a8a8a; --accent: #0052cc;
--background-accent: #e8e6e1; --background-accent: #cce5ff;
/* 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);