bender/a8b977dc-1a07-4c7f-9c9d-0ab3a828755f
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #5

Open
bender wants to merge 2 commits from version_3 into main
pull from: version_3
merge into: bender:main
Conversation 0 Commits 2 Files Changed 2 +15 -40
2 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/layout.tsx
View File

@@ -1,46 +1,22 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Lato } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "./styles/variables.css";
import "./styles/base.css";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const lato = Lato({
variable: "--font-lato", subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "J&A Tree Removal - Jacksonville, FL | Professional Tree Services", description: "Expert tree removal, stump removal, and concrete demolition in Jacksonville, FL. 5-star rated service with professional team and fair pricing.", keywords: "tree removal Jacksonville, stump removal, tree trimming, concrete removal, arborist", openGraph: {
title: "J&A Tree Removal - Jacksonville Tree Services", description: "Professional tree removal and stump removal services in Jacksonville, FL. Expert arborists, efficient service, reasonable prices.", url: "https://jandaremoval.com", siteName: "J&A Tree Removal", type: "website"},
twitter: {
card: "summary_large_image", title: "J&A Tree Removal - Jacksonville", description: "Professional tree removal and stump removal services in Jacksonville, FL"},
};
title: "J&A Tree Removal - Professional Tree Services in Jacksonville, FL", description: "Expert tree removal, stump removal, and concrete demolition services in Jacksonville, FL. Fast, professional, and reasonably priced."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${lato.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1408,7 +1384,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

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

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f5f5;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #341f51;
--background: #ffffff;
--card: #f0f9f0;
--foreground: #000f06e6;
--primary-cta: #159c49;
--primary-cta-text: #f5f5f5;
--secondary-cta: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #1c1c1c;
--accent: #6139e6;
--background-accent: #b3a8e8;
--accent: #80da9b;
--background-accent: #6bbf8e;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);