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
1 change: 1 addition & 0 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@dnd-kit/utilities": "^3.2.2",
"@emoji-mart/data": "^1.2.1",
"@emoji-mart/react": "^1.1.1",
"@fontsource-variable/inter": "^5.2.8",
"@mediapipe/tasks-vision": "^0.10.35",
"@radix-ui/react-alert-dialog": "^1.1.15",
"@radix-ui/react-avatar": "^1.1.11",
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/features/messages/lib/useRichTextEditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export function useRichTextEditor({
attributes: {
autocapitalize: "none",
autocorrect: "off",
class: `${MESSAGE_MARKDOWN_CLASS} min-h-0 resize-none overflow-y-hidden border-0 bg-transparent px-0 py-0 text-sm leading-relaxed text-foreground shadow-none focus-visible:ring-0 caret-foreground outline-hidden max-w-none`,
class: `${MESSAGE_MARKDOWN_CLASS} min-h-0 resize-none overflow-y-hidden border-0 bg-transparent px-0 py-0 text-sm leading-5 text-foreground shadow-none focus-visible:ring-0 caret-foreground outline-hidden max-w-none`,
"data-testid": "message-input",
spellcheck: "false",
},
Expand Down
1 change: 1 addition & 0 deletions desktop/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import ReactDOM from "react-dom/client";
import { App } from "@/app/App";
import "@fontsource-variable/inter/wght.css";
import "@/shared/styles/globals.css";
import { UpdaterProvider } from "@/features/settings/hooks/UpdaterProvider";
import { migrateLegacyWorkspaceStorageBeforeRender } from "@/features/workspaces/legacyWorkspaceStorage";
Expand Down
10 changes: 5 additions & 5 deletions desktop/src/shared/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,9 @@
/* ── Tiptap rich-text composer ──────────────────────────────────────── */
.rich-text-composer .tiptap {
outline: none;
min-height: calc(var(--text-sm) * var(--leading-relaxed));
min-height: 1lh;
font-size: var(--text-sm);
line-height: var(--leading-relaxed);
line-height: var(--text-sm--line-height);
}

.rich-text-composer .tiptap p {
Expand Down Expand Up @@ -619,7 +619,6 @@
--inline-code-font-size: var(--text-xs);
--agent-icon-size: 0.95em;
--agent-icon-gap: 0.125rem;
--agent-icon-top: 0.125rem;
}

.message-markdown .mention-chip,
Expand Down Expand Up @@ -702,12 +701,13 @@
.message-markdown .agent-mention-highlight::before {
content: "";
position: absolute;
top: var(--agent-icon-top);
top: 50%;
left: var(--inline-chip-padding-inline);
width: var(--agent-icon-size);
height: var(--agent-icon-size);
background: currentColor;
pointer-events: none;
transform: translateY(-50%);
-webkit-mask:
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M12 8V4H8'/%3E%3Crect width='16' height='12' x='4' y='8' rx='2'/%3E%3Cpath d='M2 14h2'/%3E%3Cpath d='M20 14h2'/%3E%3Cpath d='M15 13v2'/%3E%3Cpath d='M9 13v2'/%3E%3C/svg%3E")
center / contain no-repeat;
Expand Down Expand Up @@ -888,7 +888,7 @@

body {
@apply bg-background text-foreground antialiased;
font-family: "Geist", "Avenir Next", "Segoe UI", sans-serif;
font-family: "Inter Variable", Inter, "Avenir Next", "Segoe UI", sans-serif;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions desktop/src/shared/ui/markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ function createMarkdownComponents(
runtimeRef: React.RefObject<MarkdownRuntime>,
interactive = true,
): Components {
const paragraphClassName = "leading-relaxed";
const paragraphClassName = "leading-[inherit]";
const listItemClassName = "my-1 [&_p]:inline";
const listClassName = "space-y-1 pl-6 marker:text-muted-foreground";

Expand Down Expand Up @@ -1432,7 +1432,7 @@ function MarkdownInner({
className={cn(
MESSAGE_MARKDOWN_CLASS,
[
"max-w-none [overflow-wrap:anywhere] text-sm leading-relaxed text-foreground",
"max-w-none [overflow-wrap:anywhere] text-sm leading-5 text-foreground",
"[&>*:first-child]:mt-0 [&>*:last-child]:mb-0",
"[&>*+*]:mt-3",
"[&>p+p]:mt-1.5",
Expand Down
9 changes: 9 additions & 0 deletions desktop/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ export default {
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
},
fontFamily: {
sans: [
'"Inter Variable"',
"Inter",
'"Avenir Next"',
'"Segoe UI"',
"sans-serif",
],
},
colors: {
background: "hsl(var(--background))",
foreground: "hsl(var(--foreground))",
Expand Down
11 changes: 11 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"test:e2e:smoke": "pnpm build && playwright test --project=smoke"
},
"dependencies": {
"@fontsource-variable/inter": "^5.2.8",
"@isomorphic-git/lightning-fs": "^4.6.2",
"@radix-ui/react-slot": "^1.2.4",
"@radix-ui/react-tooltip": "^1.2.8",
Expand All @@ -37,12 +38,12 @@
},
"devDependencies": {
"@playwright/test": "^1.58.2",
"@tailwindcss/postcss": "^4.3.0",
"@tanstack/router-plugin": "^1.167.12",
"@tanstack/virtual-file-routes": "^1.161.7",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vitejs/plugin-react": "^6.0.0",
"@tailwindcss/postcss": "^4.3.0",
"postcss": "^8.5.8",
"tailwindcss": "^4.3.0",
"tw-animate-css": "^1.4.0",
Expand Down
1 change: 1 addition & 0 deletions web/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from "react";
import ReactDOM from "react-dom/client";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { App } from "@/app/App";
import "@fontsource-variable/inter/wght.css";
import "@/shared/styles/globals.css";
import { ThemeProvider } from "@/shared/theme/ThemeProvider";
import { Toaster } from "@/shared/ui/sonner";
Expand Down
2 changes: 1 addition & 1 deletion web/src/shared/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@

body {
@apply bg-background text-foreground antialiased;
font-family: "Geist", "Avenir Next", "Segoe UI", sans-serif;
font-family: "Inter Variable", Inter, "Avenir Next", "Segoe UI", sans-serif;
}
}
9 changes: 9 additions & 0 deletions web/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ export default {
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
},
fontFamily: {
sans: [
'"Inter Variable"',
"Inter",
'"Avenir Next"',
'"Segoe UI"',
"sans-serif",
],
},
colors: {
background: "hsl(var(--background))",
foreground: "hsl(var(--foreground))",
Expand Down