From fc5fc2c570e6ac5a6f9647080b80f7fec0c4b605 Mon Sep 17 00:00:00 2001 From: Adam <2363879+adamdotdevin@users.noreply.github.com> Date: Tue, 18 Nov 2025 11:00:27 -0600 Subject: wip(desktop): new layout work --- packages/ui/src/components/button.css | 24 +++++++++++++++++------- packages/ui/src/components/icon.tsx | 3 +++ packages/ui/src/components/tooltip.tsx | 32 +++++++++++++++++++------------- 3 files changed, 39 insertions(+), 20 deletions(-) (limited to 'packages/ui/src') diff --git a/packages/ui/src/components/button.css b/packages/ui/src/components/button.css index 7015ea88d..4f5ebc241 100644 --- a/packages/ui/src/components/button.css +++ b/packages/ui/src/components/button.css @@ -27,6 +27,12 @@ border-color: var(--border-active); background-color: var(--surface-brand-active); } + &:disabled { + border-color: var(--border-disabled); + background-color: var(--surface-disabled); + color: var(--text-weak); + cursor: not-allowed; + } } &[data-variant="ghost"] { @@ -43,6 +49,11 @@ &:active:not(:disabled) { background-color: var(--surface-raised-base-active); } + &:disabled { + color: var(--text-weak); + opacity: 0.7; + cursor: not-allowed; + } } &[data-variant="secondary"] { @@ -69,6 +80,12 @@ scale: 0.99; transition: all 150ms ease-out; } + &:disabled { + border-color: var(--border-disabled); + background-color: var(--surface-disabled); + color: var(--text-weak); + cursor: not-allowed; + } [data-slot="icon"] { color: var(--icon-strong-base); @@ -106,13 +123,6 @@ letter-spacing: var(--letter-spacing-normal); } - &:disabled { - border-color: var(--border-disabled); - background-color: var(--surface-disabled); - color: var(--text-weak); - cursor: not-allowed; - } - &:focus { outline: none; } diff --git a/packages/ui/src/components/icon.tsx b/packages/ui/src/components/icon.tsx index da893564e..f2594cdaa 100644 --- a/packages/ui/src/components/icon.tsx +++ b/packages/ui/src/components/icon.tsx @@ -162,6 +162,9 @@ const newIcons = { "align-right": ``, expand: ``, collapse: ``, + "folder-add-left": ``, + "settings-gear": ``, + "bubble-5": ``, } export interface IconProps extends ComponentProps<"svg"> { diff --git a/packages/ui/src/components/tooltip.tsx b/packages/ui/src/components/tooltip.tsx index e3784ed8e..663dc12e6 100644 --- a/packages/ui/src/components/tooltip.tsx +++ b/packages/ui/src/components/tooltip.tsx @@ -1,15 +1,16 @@ import { Tooltip as KobalteTooltip } from "@kobalte/core/tooltip" -import { children, createEffect, createSignal, splitProps, type JSX } from "solid-js" +import { children, createEffect, createSignal, Match, splitProps, Switch, type JSX } from "solid-js" import type { ComponentProps } from "solid-js" export interface TooltipProps extends ComponentProps { value: JSX.Element class?: string + inactive?: boolean } export function Tooltip(props: TooltipProps) { const [open, setOpen] = createSignal(false) - const [local, others] = splitProps(props, ["children", "class"]) + const [local, others] = splitProps(props, ["children", "class", "inactive"]) const c = children(() => local.children) @@ -29,16 +30,21 @@ export function Tooltip(props: TooltipProps) { }) return ( - - - {c()} - - - - {others.value} - {/* */} - - - + + {local.children} + + + + {c()} + + + + {others.value} + {/* */} + + + + + ) } -- cgit v1.2.3