Skip to content

Use Geist Pixel for list items, dropdowns, dialogs & composer controls #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julianbenegas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Geist Pixel for list items, dropdowns, dialogs & composer controls #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions apps/web/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@theme inline {
--font-sans: var(--font-geist-sans);
--font-mono: var(--font-geist-mono);
--font-pixel: var(--font-geist-pixel-square);

/* --color-base: var(--base); */
--color-background: var(--background);
Expand Down
3 changes: 2 additions & 1 deletion apps/web/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Analytics } from "@vercel/analytics/next"
import { GeistMono } from "geist/font/mono"
import { GeistPixelSquare } from "geist/font/pixel"
import { GeistSans } from "geist/font/sans"
import type { Metadata, Viewport } from "next"
import { Footer } from "@/components/footer"
Expand Down Expand Up @@ -52,7 +53,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<body
className={`${GeistSans.variable} ${GeistMono.variable} antialiased`}
className={`${GeistSans.variable} ${GeistMono.variable} ${GeistPixelSquare.variable} antialiased`}
>
<div className="root flex min-h-screen flex-col">
<Providers>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export default async function Home() {
</h3>
<div className="mt-2 flex items-center gap-1.5">
<AsteriskIcon className="shrink-0 text-faint" size={16} />
<code className="font-mono text-accent">
<code className="font-pixel text-accent">
npx skills add basehub-ai/forums --skill remote-bash
</code>
</div>
Expand Down Expand Up @@ -177,7 +177,7 @@ export default async function Home() {
className="mt-0.5 shrink-0 text-faint"
size={16}
/>
<span className="font-mono text-dim">{tool.name}</span>
<span className="font-pixel text-dim">{tool.name}</span>
</div>
<p className="ml-5.5 text-muted text-sm">
{tool.description}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/branch-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function BranchSelector({
<>
<button
className={cn(
"group flex h-9 animate-fade-in cursor-pointer items-center gap-2 bg-transparent text-faint text-sm transition-none hover:text-accent active:text-accent sm:w-auto",
"group flex h-9 animate-fade-in cursor-pointer items-center gap-2 bg-transparent font-pixel text-faint text-sm transition-none hover:text-accent active:text-accent sm:w-auto",
isBranchDialogOpen && "text-accent"
)}
onClick={() => setIsBranchDialogOpen(true)}
Expand Down
4 changes: 2 additions & 2 deletions apps/web/components/composer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export const Composer = ({
<Menu.Root onOpenChange={setIsMenuOpen}>
<Menu.Trigger
className={cn(
"group h-9 justify-between bg-transparent text-faint text-sm transition-none hover:text-accent hover:no-underline active:text-accent data-popup-open:text-accent sm:w-auto"
"group h-9 justify-between bg-transparent font-pixel text-faint text-sm transition-none hover:text-accent hover:no-underline active:text-accent data-popup-open:text-accent sm:w-auto"
)}
>
{(() => {
Expand Down Expand Up @@ -383,7 +383,7 @@ export const Composer = ({
: "Switch to ask mode"
}
className={cn(
"flex items-center justify-center gap-1 text-faint text-sm transition-colors hover:text-accent"
"flex items-center justify-center gap-1 font-pixel text-faint text-sm transition-colors hover:text-accent"
)}
onClick={toggleMode}
type="button"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/typography.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const ListItem = ({
className?: string
children: React.ReactNode
}) => {
return <div className={cn("flex h-4.5", className)}>{children}</div>
return <div className={cn("flex h-4.5 font-pixel", className)}>{children}</div>
}

export const TableColumnTitle = ({
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/ui/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function Popup({
{...props}
>
<div className="relative">
<div className="relative z-10 border border-dim bg-background">
<div className="relative z-10 border border-dim bg-background font-pixel">
{title && (
<div className="absolute -top-4 right-0 left-4 flex items-center">
<span className="bg-background px-2 font-bold text-bright text-lg tracking-normal">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/ui/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function Popup({
<div className="relative">
<BaseMenu.Popup
className={cn(
"peer relative z-50 min-w-40 border border-dim bg-background p-1.5 text-sm",
"peer relative z-50 min-w-40 border border-dim bg-background p-1.5 font-pixel text-sm",
"outline-none data-closed:pointer-events-none",
className
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/components/ui/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function Popup({
<BaseTooltip.Positioner sideOffset={sideOffset}>
<BaseTooltip.Popup
className={cn(
"z-50 max-w-[280px] bg-bright px-2 py-1 text-background text-sm shadow-sm",
"z-50 max-w-[280px] bg-bright px-2 py-1 font-pixel text-background text-sm shadow-sm",
className
)}
{...props}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dataloader": "^2.2.3",
"date-fns": "^4.1.0",
"drizzle-orm": "^0.45.1",
"geist": "^1.5.1",
"geist": "^1.7.0",
"lucide-react": "^0.562.0",
"ms": "^2.1.3",
"nanoid": "^5.1.6",
Expand Down