From 887a819f2444c8454a43049983d831194883c6cd Mon Sep 17 00:00:00 2001 From: Adam <2363879+adamdotdevin@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:05:52 -0500 Subject: [PATCH] wip: desktop work --- bun.lock | 17 +- package.json | 2 + packages/css/.gitignore | 34 --- packages/css/package.json | 18 -- packages/css/src/index.css | 14 - packages/css/src/tailwind.css | 12 - packages/css/src/utilities.css | 37 --- packages/desktop/package.json | 4 +- .../desktop/src/components/prompt-input.tsx | 2 +- .../desktop/src/components/session-list.tsx | 38 --- packages/desktop/src/context/sync.tsx | 5 +- packages/desktop/src/index.css | 2 +- packages/desktop/src/pages/index.tsx | 48 +++- packages/ui/package.json | 23 +- packages/{css => ui}/script/colors.txt | 0 .../colors.ts => ui/script/tailwind.ts} | 10 +- .../src/assets/fonts/geist-italic.ttf | Bin .../src/assets/fonts/geist-italic.woff2 | Bin .../src/assets/fonts/geist-mono-italic.ttf | Bin .../src/assets/fonts/geist-mono-italic.woff2 | Bin .../src/assets/fonts/geist-mono.ttf | Bin .../src/assets/fonts/geist-mono.woff2 | Bin .../{css => ui}/src/assets/fonts/geist.ttf | Bin .../{css => ui}/src/assets/fonts/geist.woff2 | Bin .../{css => ui}/src/components/button.css | 38 ++- packages/ui/src/components/fonts.tsx | 12 +- packages/{css => ui}/src/components/icon.css | 0 packages/ui/src/components/index.ts | 1 + packages/ui/src/components/list.css | 30 +++ packages/ui/src/components/list.tsx | 76 ++++++ .../{css => ui}/src/components/select.css | 2 + packages/ui/src/components/style.css | 2 - packages/{css => ui}/src/components/tabs.css | 4 +- .../{css => ui}/src/components/tooltip.css | 18 +- packages/ui/src/components/tooltip.tsx | 2 +- packages/ui/src/{app.tsx => demo.tsx} | 12 +- packages/ui/src/index.css | 4 +- packages/ui/src/index.tsx | 4 +- packages/{css/src => ui/src/styles}/base.css | 14 +- .../color.css => ui/src/styles/colors.css} | 0 packages/ui/src/styles/index.css | 15 ++ .../src/styles/tailwind/colors.css} | 2 +- packages/ui/src/styles/tailwind/index.css | 40 +++ packages/ui/src/styles/tailwind/utilities.css | 9 + packages/{css/src => ui/src/styles}/theme.css | 252 ++++++------------ packages/ui/src/styles/utilities.css | 109 ++++++++ 46 files changed, 514 insertions(+), 398 deletions(-) delete mode 100644 packages/css/.gitignore delete mode 100644 packages/css/package.json delete mode 100644 packages/css/src/index.css delete mode 100644 packages/css/src/tailwind.css delete mode 100644 packages/css/src/utilities.css delete mode 100644 packages/desktop/src/components/session-list.tsx rename packages/{css => ui}/script/colors.txt (100%) rename packages/{css/script/colors.ts => ui/script/tailwind.ts} (57%) rename packages/{css => ui}/src/assets/fonts/geist-italic.ttf (100%) rename packages/{css => ui}/src/assets/fonts/geist-italic.woff2 (100%) rename packages/{css => ui}/src/assets/fonts/geist-mono-italic.ttf (100%) rename packages/{css => ui}/src/assets/fonts/geist-mono-italic.woff2 (100%) rename packages/{css => ui}/src/assets/fonts/geist-mono.ttf (100%) rename packages/{css => ui}/src/assets/fonts/geist-mono.woff2 (100%) rename packages/{css => ui}/src/assets/fonts/geist.ttf (100%) rename packages/{css => ui}/src/assets/fonts/geist.woff2 (100%) rename packages/{css => ui}/src/components/button.css (71%) rename packages/{css => ui}/src/components/icon.css (100%) create mode 100644 packages/ui/src/components/list.css create mode 100644 packages/ui/src/components/list.tsx rename packages/{css => ui}/src/components/select.css (98%) delete mode 100644 packages/ui/src/components/style.css rename packages/{css => ui}/src/components/tabs.css (95%) rename packages/{css => ui}/src/components/tooltip.css (69%) rename packages/ui/src/{app.tsx => demo.tsx} (92%) rename packages/{css/src => ui/src/styles}/base.css (93%) rename packages/{css/src/color.css => ui/src/styles/colors.css} (100%) create mode 100644 packages/ui/src/styles/index.css rename packages/{css/src/tailwind-colors.css => ui/src/styles/tailwind/colors.css} (99%) create mode 100644 packages/ui/src/styles/tailwind/index.css create mode 100644 packages/ui/src/styles/tailwind/utilities.css rename packages/{css/src => ui/src/styles}/theme.css (75%) create mode 100644 packages/ui/src/styles/utilities.css diff --git a/bun.lock b/bun.lock index 34d93e24..a2a98afc 100644 --- a/bun.lock +++ b/bun.lock @@ -138,9 +138,9 @@ "remeda": "catalog:", "shiki": "3.9.2", "solid-js": "catalog:", - "solid-list": "0.3.0", + "solid-list": "catalog:", "tailwindcss": "catalog:", - "virtua": "0.42.3", + "virtua": "catalog:", }, "devDependencies": { "@tailwindcss/vite": "catalog:", @@ -281,12 +281,17 @@ "version": "0.15.7", "dependencies": { "@kobalte/core": "catalog:", - "@opencode-ai/css": "workspace:*", "@solidjs/meta": "catalog:", + "luxon": "catalog:", "remeda": "catalog:", "solid-js": "catalog:", + "solid-list": "catalog:", + "virtua": "catalog:", }, "devDependencies": { + "@tailwindcss/vite": "catalog:", + "@types/bun": "catalog:", + "tailwindcss": "catalog:", "typescript": "catalog:", "vite": "catalog:", "vite-plugin-solid": "catalog:", @@ -355,8 +360,10 @@ "luxon": "3.6.1", "remeda": "2.26.0", "solid-js": "1.9.9", + "solid-list": "0.3.0", "tailwindcss": "4.1.11", "typescript": "5.8.2", + "virtua": "0.42.3", "vite": "7.1.4", "vite-plugin-solid": "2.11.8", "zod": "4.1.8", @@ -3694,7 +3701,7 @@ "named-placeholders/lru-cache": ["lru-cache@7.18.3", "", {}, "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="], - "nitropack/c12": ["c12@3.3.0", "", { "dependencies": { "chokidar": "^4.0.3", "confbox": "^0.2.2", "defu": "^6.1.4", "dotenv": "^17.2.2", "exsolve": "^1.0.7", "giget": "^2.0.0", "jiti": "^2.5.1", "ohash": "^2.0.11", "pathe": "^2.0.3", "perfect-debounce": "^2.0.0", "pkg-types": "^2.3.0", "rc9": "^2.1.2" }, "peerDependencies": { "magicast": "^0.3.5" }, "optionalPeers": ["magicast"] }, "sha512-K9ZkuyeJQeqLEyqldbYLG3wjqwpw4BVaAqvmxq3GYKK0b1A/yYQdIcJxkzAOWcNVWhJpRXAPfZFueekiY/L8Dw=="], + "nitropack/c12": ["c12@3.3.1", "", { "dependencies": { "chokidar": "^4.0.3", "confbox": "^0.2.2", "defu": "^6.1.4", "dotenv": "^17.2.3", "exsolve": "^1.0.7", "giget": "^2.0.0", "jiti": "^2.6.1", "ohash": "^2.0.11", "pathe": "^2.0.3", "perfect-debounce": "^2.0.0", "pkg-types": "^2.3.0", "rc9": "^2.1.2" }, "peerDependencies": { "magicast": "^0.3.5" }, "optionalPeers": ["magicast"] }, "sha512-LcWQ01LT9tkoUINHgpIOv3mMs+Abv7oVCrtpMRi1PaapVEpWoMga5WuT7/DqFTu7URP9ftbOmimNw1KNIGh9DQ=="], "nitropack/globby": ["globby@15.0.0", "", { "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", "fast-glob": "^3.3.3", "ignore": "^7.0.5", "path-type": "^6.0.0", "slash": "^5.1.0", "unicorn-magic": "^0.3.0" } }, "sha512-oB4vkQGqlMl682wL1IlWd02tXCbquGWM4voPEI85QmNKCaw8zGTm1f1rubFgkg3Eli2PtKlFgrnmUqasbQWlkw=="], @@ -4102,8 +4109,6 @@ "axios/form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - "bl/buffer/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="], - "body-parser/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], "c12/pkg-types/pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], diff --git a/package.json b/package.json index 6b697a66..68e2d1f2 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,9 @@ "zod": "4.1.8", "remeda": "2.26.0", "solid-js": "1.9.9", + "solid-list": "0.3.0", "tailwindcss": "4.1.11", + "virtua": "0.42.3", "vite": "7.1.4", "vite-plugin-solid": "2.11.8" } diff --git a/packages/css/.gitignore b/packages/css/.gitignore deleted file mode 100644 index a14702c4..00000000 --- a/packages/css/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -# dependencies (bun install) -node_modules - -# output -out -dist -*.tgz - -# code coverage -coverage -*.lcov - -# logs -logs -_.log -report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# caches -.eslintcache -.cache -*.tsbuildinfo - -# IntelliJ based IDEs -.idea - -# Finder (MacOS) folder config -.DS_Store diff --git a/packages/css/package.json b/packages/css/package.json deleted file mode 100644 index 19bb2bf6..00000000 --- a/packages/css/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@opencode-ai/css", - "version": "0.15.7", - "type": "module", - "exports": { - ".": "./src/index.css", - "./*": "./src/*", - "./fonts/*": "./src/assets/fonts/*" - }, - "scripts": { - "dev": "bun run dev.ts", - "generate:tailwind": "bun run script/colors.ts" - }, - "dependencies": { - "tailwindcss": "catalog:", - "@tailwindcss/vite": "catalog:" - } -} diff --git a/packages/css/src/index.css b/packages/css/src/index.css deleted file mode 100644 index ff67c6a6..00000000 --- a/packages/css/src/index.css +++ /dev/null @@ -1,14 +0,0 @@ -@layer theme, base, components, utilities; - -@import "./color.css" layer(theme); -@import "./theme.css" layer(theme); - -@import "./base.css" layer(base); - -@import "./components/button.css" layer(components); -@import "./components/icon.css" layer(components); -@import "./components/select.css" layer(components); -@import "./components/tabs.css" layer(components); -@import "./components/tooltip.css" layer(components); - -@import "./utilities.css" layer(utilities); diff --git a/packages/css/src/tailwind.css b/packages/css/src/tailwind.css deleted file mode 100644 index 327eba29..00000000 --- a/packages/css/src/tailwind.css +++ /dev/null @@ -1,12 +0,0 @@ -@layer theme, base, components, utilities; -@import "tailwindcss/theme.css" layer(theme); -@import "tailwindcss/utilities.css" layer(utilities); - -@import "./index.css"; - -@theme { - --shadow-*: initial; - --shadow-xs-border-selected: var(--shadow-xs-border-selected); -} - -@import "./tailwind-colors.css"; diff --git a/packages/css/src/utilities.css b/packages/css/src/utilities.css deleted file mode 100644 index d2f61425..00000000 --- a/packages/css/src/utilities.css +++ /dev/null @@ -1,37 +0,0 @@ -:root { - interpolate-size: allow-keywords; - - [data-popper-positioner] { - pointer-events: none; - } - - ::selection { - background-color: color-mix(in srgb, var(--color-primary) 33%, transparent); - /* background-color: var(--color-primary); */ - /* color: var(--color-background); */ - } - - ::-webkit-scrollbar-track { - background: var(--theme-background-panel); - } - - ::-webkit-scrollbar-thumb { - background-color: var(--theme-border-subtle); - border-radius: 6px; - } - - * { - scrollbar-color: var(--theme-border-subtle) var(--theme-background-panel); - } -} - -.no-scrollbar { - &::-webkit-scrollbar { - display: none; - } - /* Hide scrollbar for IE, Edge and Firefox */ - & { - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - } -} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index b399d616..523242f1 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -42,9 +42,9 @@ "remeda": "catalog:", "solid-js": "catalog:", "shiki": "3.9.2", - "solid-list": "0.3.0", + "solid-list": "catalog:", "tailwindcss": "catalog:", - "virtua": "0.42.3" + "virtua": "catalog:" }, "prettier": { "semi": false, diff --git a/packages/desktop/src/components/prompt-input.tsx b/packages/desktop/src/components/prompt-input.tsx index 48d23840..0f8fb593 100644 --- a/packages/desktop/src/components/prompt-input.tsx +++ b/packages/desktop/src/components/prompt-input.tsx @@ -187,7 +187,7 @@ export const PromptInput: Component = (props) => { return (
- {(session) => ( - - - - )} - - ) -} diff --git a/packages/desktop/src/context/sync.tsx b/packages/desktop/src/context/sync.tsx index 5d64f3ee..5ba6b1af 100644 --- a/packages/desktop/src/context/sync.tsx +++ b/packages/desktop/src/context/sync.tsx @@ -1,4 +1,4 @@ -import type { Message, Agent, Provider, Session, Part, Config, Path, File, FileNode } from "@opencode-ai/sdk" +import type { Message, Agent, Provider, Session, Part, Config, Path, File, FileNode, Project } from "@opencode-ai/sdk" import { createStore, produce, reconcile } from "solid-js/store" import { createContext, createMemo, Show, useContext, type ParentProps } from "solid-js" import { useSDK, useEvent } from "@/context" @@ -9,6 +9,7 @@ function init() { ready: boolean provider: Provider[] agent: Agent[] + project: Project config: Config path: Path session: Session[] @@ -21,6 +22,7 @@ function init() { node: FileNode[] changes: File[] }>({ + project: { id: "", worktree: "", time: { created: 0, initialized: 0 } }, config: {}, path: { state: "", config: "", worktree: "", directory: "" }, ready: false, @@ -96,6 +98,7 @@ function init() { const sdk = useSDK() const load = { + project: () => sdk.project.current().then((x) => setStore("project", x.data!)), provider: () => sdk.config.providers().then((x) => setStore("provider", x.data!.providers)), path: () => sdk.path.get().then((x) => setStore("path", x.data!)), agent: () => sdk.app.agents().then((x) => setStore("agent", x.data ?? [])), diff --git a/packages/desktop/src/index.css b/packages/desktop/src/index.css index b4717a4e..4af87bca 100644 --- a/packages/desktop/src/index.css +++ b/packages/desktop/src/index.css @@ -1 +1 @@ -@import "@opencode-ai/css/tailwind.css"; +@import "@opencode-ai/ui/styles/tailwind"; diff --git a/packages/desktop/src/pages/index.tsx b/packages/desktop/src/pages/index.tsx index 1174f1e1..4133887c 100644 --- a/packages/desktop/src/pages/index.tsx +++ b/packages/desktop/src/pages/index.tsx @@ -1,4 +1,4 @@ -import { Icon, Tooltip } from "@opencode-ai/ui" +import { Button, Icon, List, Tooltip } from "@opencode-ai/ui" import { FileIcon, IconButton } from "@/ui" import FileTree from "@/components/file-tree" import EditorPane from "@/components/editor-pane" @@ -6,12 +6,12 @@ import { For, Match, onCleanup, onMount, Show, Switch } from "solid-js" import { SelectDialog } from "@/components/select-dialog" import { useSync, useSDK, useLocal } from "@/context" import type { LocalFile, TextSelection } from "@/context/local" -import SessionList from "@/components/session-list" import SessionTimeline from "@/components/session-timeline" -import PromptForm, { type PromptContentPart, type PromptSubmitValue } from "@/components/prompt-form" +import { type PromptContentPart, type PromptSubmitValue } from "@/components/prompt-form" import { createStore } from "solid-js/store" import { getDirectory, getFilename } from "@/utils" import { PromptInput } from "@/components/prompt-input" +import { DateTime } from "luxon" export default function Page() { const local = useLocal() @@ -225,13 +225,45 @@ export default function Page() { ) return ( -
- +
+
-
- +
+
+ {sync.data.path.directory} +
+
+
+ +
+ x.id} onSelect={(s) => local.session.setActive(s?.id)}> + {(session) => ( + +
+
+ + {session.title} + + + {DateTime.fromMillis(session.time.updated).toRelative()} + +
+
+ 2 files changed +
+ +43 + -2 +
+
+
+ + )} + +
-
+
{(activeSession) => } diff --git a/packages/ui/package.json b/packages/ui/package.json index 2a88f86a..705d8648 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -4,21 +4,30 @@ "type": "module", "exports": { ".": "./src/components/index.ts", - "./*": "./src/components/*" + "./*": "./src/components/*.tsx", + "./styles": "./src/styles/index.css", + "./styles/tailwind": "./src/styles/tailwind/index.css", + "./fonts/*": "./src/assets/fonts/*" }, "scripts": { - "dev": "vite" + "dev": "vite", + "generate:tailwind": "bun run script/tailwind.ts" }, "devDependencies": { + "@types/bun": "catalog:", "typescript": "catalog:", "vite": "catalog:", - "vite-plugin-solid": "catalog:" + "vite-plugin-solid": "catalog:", + "tailwindcss": "catalog:", + "@tailwindcss/vite": "catalog:" }, "dependencies": { - "remeda": "catalog:", - "solid-js": "catalog:", - "@solidjs/meta": "catalog:", "@kobalte/core": "catalog:", - "@opencode-ai/css": "workspace:*" + "@solidjs/meta": "catalog:", + "remeda": "catalog:", + "luxon": "catalog:", + "virtua": "catalog:", + "solid-js": "catalog:", + "solid-list": "catalog:" } } diff --git a/packages/css/script/colors.txt b/packages/ui/script/colors.txt similarity index 100% rename from packages/css/script/colors.txt rename to packages/ui/script/colors.txt diff --git a/packages/css/script/colors.ts b/packages/ui/script/tailwind.ts similarity index 57% rename from packages/css/script/colors.ts rename to packages/ui/script/tailwind.ts index b4f1e7f0..1c706469 100644 --- a/packages/css/script/colors.ts +++ b/packages/ui/script/tailwind.ts @@ -1,10 +1,5 @@ #!/usr/bin/env bun -// read lines from colors.txt -// parse each line into a color name and hex value -// create a css variable for each color -// NOTE: only use Bun file APIs here - const colors = await Bun.file(import.meta.dir + "/colors.txt").text() const variables = [] @@ -25,7 +20,4 @@ const output = ` } ` -// write to src/tailwind-colors.css -Bun.file(import.meta.dir + "/../src/tailwind-colors.css").write(output.trim()) - -// Bun.file(import.meta.dir + "../src/tailwind-colors.css").write(output.trim()) +await Bun.file(import.meta.dir + "/../src/styles/tailwind/colors.css").write(output.trim()) diff --git a/packages/css/src/assets/fonts/geist-italic.ttf b/packages/ui/src/assets/fonts/geist-italic.ttf similarity index 100% rename from packages/css/src/assets/fonts/geist-italic.ttf rename to packages/ui/src/assets/fonts/geist-italic.ttf diff --git a/packages/css/src/assets/fonts/geist-italic.woff2 b/packages/ui/src/assets/fonts/geist-italic.woff2 similarity index 100% rename from packages/css/src/assets/fonts/geist-italic.woff2 rename to packages/ui/src/assets/fonts/geist-italic.woff2 diff --git a/packages/css/src/assets/fonts/geist-mono-italic.ttf b/packages/ui/src/assets/fonts/geist-mono-italic.ttf similarity index 100% rename from packages/css/src/assets/fonts/geist-mono-italic.ttf rename to packages/ui/src/assets/fonts/geist-mono-italic.ttf diff --git a/packages/css/src/assets/fonts/geist-mono-italic.woff2 b/packages/ui/src/assets/fonts/geist-mono-italic.woff2 similarity index 100% rename from packages/css/src/assets/fonts/geist-mono-italic.woff2 rename to packages/ui/src/assets/fonts/geist-mono-italic.woff2 diff --git a/packages/css/src/assets/fonts/geist-mono.ttf b/packages/ui/src/assets/fonts/geist-mono.ttf similarity index 100% rename from packages/css/src/assets/fonts/geist-mono.ttf rename to packages/ui/src/assets/fonts/geist-mono.ttf diff --git a/packages/css/src/assets/fonts/geist-mono.woff2 b/packages/ui/src/assets/fonts/geist-mono.woff2 similarity index 100% rename from packages/css/src/assets/fonts/geist-mono.woff2 rename to packages/ui/src/assets/fonts/geist-mono.woff2 diff --git a/packages/css/src/assets/fonts/geist.ttf b/packages/ui/src/assets/fonts/geist.ttf similarity index 100% rename from packages/css/src/assets/fonts/geist.ttf rename to packages/ui/src/assets/fonts/geist.ttf diff --git a/packages/css/src/assets/fonts/geist.woff2 b/packages/ui/src/assets/fonts/geist.woff2 similarity index 100% rename from packages/css/src/assets/fonts/geist.woff2 rename to packages/ui/src/assets/fonts/geist.woff2 diff --git a/packages/css/src/components/button.css b/packages/ui/src/components/button.css similarity index 71% rename from packages/css/src/components/button.css rename to packages/ui/src/components/button.css index c50d7641..c9ccf4ec 100644 --- a/packages/css/src/components/button.css +++ b/packages/ui/src/components/button.css @@ -5,13 +5,9 @@ justify-content: center; border-style: solid; border-width: 1px; - border-radius: var(--radius-md); - font-size: var(--text-base); - line-height: var(--text-base--line-height); - font-weight: var(--font-weight-normal); + border-radius: 6px; text-decoration: none; user-select: none; - gap: calc(var(--spacing) * 0.5); &[data-variant="primary"] { border-color: var(--border-base); @@ -33,10 +29,16 @@ } &[data-variant="secondary"] { - border-color: var(--border-base); - background-color: var(--surface-base); + border-color: var(--border-weak-base); + background-color: var(--button-secondary-base); color: var(--text-strong); + /* shadow-xs */ + box-shadow: + 0 1px 2px -1px rgba(19, 16, 16, 0.04), + 0 1px 2px 0 rgba(19, 16, 16, 0.06), + 0 1px 3px 0 rgba(19, 16, 16, 0.08); + &:hover:not(:disabled) { border-color: var(--border-hover); background-color: var(--surface-hover); @@ -70,15 +72,25 @@ } &[data-size="normal"] { - padding: calc(var(--spacing) * 0.5) calc(var(--spacing) * 3); - font-size: var(--text-xs); - line-height: var(--text-sm--line-height); + padding: 0 6px 0 6px; + + font-size: var(--font-size-small); + line-height: var(--line-height-large); + gap: calc(var(--spacing) * 0.5); } &[data-size="large"] { - padding: calc(var(--spacing) * 1) calc(var(--spacing) * 4); - font-size: var(--text-sm); - line-height: var(--text-sm--line-height); + height: 32px; + padding: 0 8px 0 6px; + gap: 8px; + + /* text-12-medium */ + font-family: var(--font-family-sans); + font-size: var(--font-size-small); + font-style: normal; + font-weight: var(--font-weight-medium); + line-height: var(--line-height-large); /* 166.667% */ + letter-spacing: var(--letter-spacing-normal); } &:disabled { diff --git a/packages/ui/src/components/fonts.tsx b/packages/ui/src/components/fonts.tsx index 447c486e..ff4fb758 100644 --- a/packages/ui/src/components/fonts.tsx +++ b/packages/ui/src/components/fonts.tsx @@ -1,20 +1,20 @@ import { Style, Link } from "@solidjs/meta" -import geist from "@opencode-ai/css/fonts/geist.woff2" -import geistMono from "@opencode-ai/css/fonts/geist-mono.woff2" +import geist from "../assets/fonts/geist.woff2" +import geistMono from "../assets/fonts/geist-mono.woff2" export const Fonts = () => { return ( <>