Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/* If you want tailwind 'base' styles to override 'webflow' styles, re-order the layers */
@layer properties, theme, base, webflow, components, utilities;

/* Webflow global styles are imported in the 'webflow' layer */
@import "../webflow/css/global.css" layer(webflow);
/* Webflow global styles. Imported unlayered so DevLink's internal @layer
ordering (normalize, defaults) stays intact — wrapping this @import in
layer(webflow) breaks Google font preconnects in exported components. */
@import "../webflow/css/global.css";
@import "tailwindcss";

:root {
Expand All @@ -13,8 +12,6 @@
@theme inline {
--color-background: var(--background);
--color-foreground: var(--foreground);
--font-sans: var(--font-geist-sans);
--font-mono: var(--font-geist-mono);
}

@media (prefers-color-scheme: dark) {
Expand Down
20 changes: 1 addition & 19 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
import type { Metadata } from "next";
import { Geist, Geist_Mono, Inter } from "next/font/google";
import "./globals.css";
import { DevLinkProvider } from "@/webflow/DevLinkProvider";

const inter = Inter({
subsets: ["latin"],
variable: "--font-inter",
});

const geistSans = Geist({
variable: "--font-geist-sans",
subsets: ["latin"],
});

const geistMono = Geist_Mono({
variable: "--font-geist-mono",
subsets: ["latin"],
});

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
Expand All @@ -30,9 +14,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body
className={`${geistSans.variable} ${geistMono.variable} ${inter.variable} antialiased`}
>
<body className="antialiased">
<DevLinkProvider>
{/* Add here any Navbar or Header you want to be present on all pages */}
{children}
Expand Down