Skip to content
Open
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
58 changes: 48 additions & 10 deletions apps/blog/src/app/(blog)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,61 @@
import { HomeLayout } from 'fumadocs-ui/layouts/home';
import { BaseLayoutProps } from 'fumadocs-ui/layouts/shared';
export function baseOptions(): BaseLayoutProps {
import { WebNavigation } from "@prisma-docs/ui/components/web-navigation";
export function baseOptions() {
return {
nav: {
title: 'My App',
title: "My App",
},
links: [
{
url: '/docs',
text: 'Docs',
text: "Products",
sub: [
{
text: "Postgres",
url: "/postgres",
desc: "Managed Postgres for global workloads",
icon: "fa-regular fa-chart-pyramid",
},
{
text: "ORM",
url: "/orm",
desc: "Managed Postgres for global workloads",
icon: "fa-regular fa-database",
},
],
},
{
url: '/blog',
text: 'Blog',
url: "/pricing",
text: "Pricing",
},
{
text: "Resources",
sub: [
{
text: "MCP",
url: "/mcp",
},
{
text: "Tutorials",
url: "/learn",
},
],
},
{
url: "/partners",
text: "Partners",
},
{
url: "/blog",
text: "Blog",
},
],
};
}

export default function Layout({ children, }: { children: React.ReactNode; }) {
return <HomeLayout {...baseOptions()}>{children}</HomeLayout>;
export default function Layout({ children }: { children: React.ReactNode }) {
return (
<>
<WebNavigation links={baseOptions().links} />
{children}
</>
);
}
26 changes: 16 additions & 10 deletions apps/blog/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
import { RootProvider } from 'fumadocs-ui/provider/next';
import './global.css';
import { Inter, Barlow } from 'next/font/google';
import { RootProvider } from "fumadocs-ui/provider/next";
import "./global.css";
import { Inter, Barlow } from "next/font/google";
import Script from "next/script";

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

const barlow = Barlow({
subsets: ['latin'],
weight: ['400', '500', '600', '700'],
variable: '--font-barlow',
subsets: ["latin"],
weight: ["400", "500", "600", "700"],
variable: "--font-barlow",
});

export default function Layout({ children }: LayoutProps<'/'>) {
export default function Layout({ children }: LayoutProps<"/">) {
return (
<html
lang="en"
className={`${inter.variable} ${barlow.variable}`}
suppressHydrationWarning
>
<head></head>
<head>
<Script
src="https://kit.fontawesome.com/6916e9db27.js"
crossOrigin="anonymous"
></Script>
</head>
<body className="flex flex-col min-h-screen">
<RootProvider>{children}</RootProvider>
</body>
Expand Down
32 changes: 17 additions & 15 deletions packages/eclipse/src/components/action.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@ const actionVariants = cva(
{
variants: {
color: {
ppg: "bg-background-ppg",
orm: "bg-background-orm",
error: "bg-background-error",
success: "bg-background-success",
warning: "bg-background-warning",
cyan: "bg-background-cyan",
fuchsia: "bg-background-fuchsia",
lime: "bg-background-lime",
pink: "bg-background-pink",
purple: "bg-background-purple",
sky: "bg-background-sky",
violet: "bg-background-violet",
yellow: "bg-background-yellow",
neutral: "bg-background-neutral",
"neutral-reversed": "bg-background-neutral-reverse",
ppg: "bg-background-ppg text-foreground-ppg",
orm: "bg-background-orm text-foreground-orm",
error: "bg-background-error text-foreground-error",
success: "bg-background-success text-foreground-success",
warning: "bg-background-warning text-foreground-warning",
cyan: "bg-background-cyan text-foreground-cyan",
fuchsia: "bg-background-fuchsia text-foreground-fuchsia",
lime: "bg-background-lime text-foreground-lime",
pink: "bg-background-pink text-foreground-pink",
purple: "bg-background-purple text-foreground-purple",
sky: "bg-background-sky text-foreground-sky",
violet: "bg-background-violet text-foreground-violet",
yellow: "bg-background-yellow text-foreground-yellow",
neutral: "bg-background-neutral text-foreground-neutral",
"neutral-reversed":
"bg-background-neutral-reverse text-foreground-neutral-reverse",
},
size: {
lg: "h-7 w-7 p-1.5",
"2xl": "h-9 w-9 p-2",
nav: "h-10 w-10 p-2.5",
"4xl": "h-12 w-12 p-3",
"5xl": "h-16 w-16 p-4",
},
Expand Down
6 changes: 3 additions & 3 deletions packages/eclipse/src/components/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import * as React from "react";
import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "../lib/cn";

const buttonVariants = cva("border", {
const buttonVariants = cva("", {
variants: {
variant: {
ppg: "bg-background-ppg-reverse text-foreground-ppg-reverse hover:bg-background-ppg-reverse-strong",
orm: "bg-background-orm-reverse text-foreground-orm-reverse hover:bg-background-orm-reverse-strong",
default:
"bg-background-default border-stroke-neutral text-foreground-neutral",
"bg-background-default border border-stroke-neutral text-foreground-neutral",
"default-stronger":
"bg-background-neutral border-stroke-neutral text-foreground-neutral hover:bg-background-neutral-strong",
"bg-background-neutral text-foreground-neutral hover:bg-background-neutral-strong",
"default-weaker": "bg-background-neutral text-foreground-neutral-weaker",
error:
"bg-background-error-reverse text-foreground-error-reverse hover:bg-backΩground-error-reverse-strong focus-visible:ring-stroke-error",
Expand Down
Binary file not shown.
Binary file not shown.
9 changes: 8 additions & 1 deletion packages/eclipse/src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
@source "../components/**/*.tsx";
@source "../components/ui/**/*.tsx";

@font-face {
font-family: "Monaspace Neon Var";
src:
url("../static/fonts/monaspace_neon_var.woff") format("woff"),
url("../static/fonts/monaspace_neon_var.woff2") format("woff2");
}

@theme {
/* Box Shadow */
--shadow-drop-low: 0 1px 2px 0 rgba(0, 0, 0, 0.04);
Expand Down Expand Up @@ -75,7 +82,7 @@
--font-family-display: var(--font-mona-sans), Inter, sans-serif;
--font-family-sans-display: Inter, sans-serif;
--font-family-sans: Inter, system-ui, sans-serif;
--font-family-mono: Jetbrains Mono, monospace;
--font-family-mono: Monaspace Neon Var;

/* Tailwind Font Family Mappings */
--font-display: var(--font-mona-sans), Inter, sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion packages/eclipse/src/tokens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export const typography = {
fontFamily: {
"sans-display": "Inter",
sans: "Inter",
monospace: "Jetbrains Mono",
monospace: "Monaspace Neon Var",
},
fontSize: {
"2xs": 11,
Expand Down
1 change: 1 addition & 0 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"dependencies": {
"@base-ui/react": "catalog:",
"@prisma-docs/eclipse": "workspace:*",
"class-variance-authority": "catalog:",
"clsx": "catalog:",
"feed": "catalog:",
Expand Down
10 changes: 10 additions & 0 deletions packages/ui/src/components/fontawesome-web.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"use client";
export function FontAwesomeScript() {
return (
<script
src="https://kit.fontawesome.com/ad485975d2.js"
cross-origin="anonymous"
async
/>
);
}
Loading
Loading