bender/66d4a462-54fd-401f-aefa-273d688dc64d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-05-13 16:26:16 +00:00
Conversation 0 Commits 2 Files Changed 2 +8 -9
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -7,6 +7,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 { Montserrat } from "next/font/google"; import { Montserrat } from "next/font/google";
import { Roboto } from "next/font/google";
@@ -16,13 +17,11 @@ export const metadata: Metadata = {
keywords: ["industrial installation, machinery fabrication, metal fabrication, industrial engineering, mechanical support, Montgomery AL"], keywords: ["industrial installation, machinery fabrication, metal fabrication, industrial engineering, mechanical support, Montgomery AL"],
}; };
const montserrat = Montserrat({
variable: "--font-montserrat", const roboto = Roboto({
subsets: ["latin"], variable: "--font-roboto",
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -33,7 +32,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${montserrat.variable} ${inter.variable} antialiased`}> <body className={`${roboto.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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