Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

style: fix half pix ring don't work (#5360)

Seamus0e127bd39514
diff --git a/apps/web/src/components/app/mobile/MobileTouchMenu.tsx b/apps/web/src/components/app/mobile/MobileTouchMenu.tsx
index bbfa7a2608..1dce1d0b8e 100644
--- a/apps/web/src/components/app/mobile/MobileTouchMenu.tsx
+++ b/apps/web/src/components/app/mobile/MobileTouchMenu.tsx
@@ -208,7 +208,7 @@ export function MobileTouchMenu(props: {
}}
>
<div
- class="mobile-touch-menu-content flex items-end justify-start overflow-hidden rounded-2xl bg-menu ring ring-edge shadow-xl"
+ class="mobile-touch-menu-content flex items-end justify-start overflow-hidden rounded-2xl border border-edge bg-menu shadow-xl"
data-expanded={open() ? '' : undefined}
style={{
'--mobile-touch-menu-width': menuSize.width
diff --git a/apps/web/src/components/ui/components/Dropdown.tsx b/apps/web/src/components/ui/components/Dropdown.tsx
index ce2e49690d..dcf1691c76 100644
--- a/apps/web/src/components/ui/components/Dropdown.tsx
+++ b/apps/web/src/components/ui/components/Dropdown.tsx
@@ -196,7 +196,7 @@ function DropdownContent(props: DropdownContentProps) {
{...rest}
ref={setContentRef}
>
- <div class="flex flex-col gap-px bg-edge-muted size-full">
+ <div class="flex flex-col gap-(--app-border-width) bg-edge-muted size-full">
{local.children}
</div>
</KobalteDropdownMenu.Content>
@@ -237,7 +237,7 @@ function DropdownSubContent(props: DropdownSubContentProps) {
{...rest}
ref={setContentRef}
>
- <div class="flex flex-col gap-px bg-edge-muted size-full">
+ <div class="flex flex-col gap-(--app-border-width) bg-edge-muted size-full">
{local.children}
</div>
</KobalteDropdownMenu.SubContent>
diff --git a/apps/web/src/components/ui/components/Surface.tsx b/apps/web/src/components/ui/components/Surface.tsx
index ff72502bdb..4302f323e3 100644
--- a/apps/web/src/components/ui/components/Surface.tsx
+++ b/apps/web/src/components/ui/components/Surface.tsx
@@ -29,7 +29,7 @@ export function Surface(props: SurfaceProps) {
const base: JSX.CSSProperties = {};
if (!local.hideBorder) {
- base.border = `0.5px solid ${local.edgeColor ?? 'var(--b4)'}`;
+ base.border = `var(--app-border-width, 0.5px) solid ${local.edgeColor ?? 'var(--b4)'}`;
}
if (local.active) {
diff --git a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx
index 25092ef8bd..3f002b3f47 100644
--- a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx
+++ b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx
@@ -50,7 +50,7 @@ export function MobileAuthWelcome() {
</Button>
<Button
size="lg"
- class="ring ring-edge-muted"
+ class="border border-edge-muted"
onClick={() => navigate('/login')}
>
Log into existing account
diff --git a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx
index 1b8c5f2645..80c8c57429 100644
--- a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx
+++ b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx
@@ -111,7 +111,7 @@ export function OnboardingConnectAccounts() {
<Button
variant="contrast"
size="lg"
- class="ring ring-edge-muted"
+ class="border border-edge-muted"
disabled={!isAuthenticated()}
onClick={() => void addInbox()}
>
@@ -129,7 +129,7 @@ export function OnboardingConnectAccounts() {
<Button
variant="contrast"
size="lg"
- class="ring ring-edge-muted"
+ class="border border-edge-muted"
disabled={
!isAuthenticated() || githubLinked() || initGithubLink.isPending
}
diff --git a/apps/web/src/features/block-automation/component/AutomationTimePicker.tsx b/apps/web/src/features/block-automation/component/AutomationTimePicker.tsx
index 3f9c4de286..fa3828019d 100644
--- a/apps/web/src/features/block-automation/component/AutomationTimePicker.tsx
+++ b/apps/web/src/features/block-automation/component/AutomationTimePicker.tsx
@@ -90,7 +90,7 @@ export function AutomationTimePicker(props: {
</button>
<Show when={open()}>
<div
- class="absolute inset-x-0 top-full mt-1 z-action-menu bg-surface ring ring-edge-muted rounded-sm p-3"
+ class="absolute inset-x-0 top-full mt-1 z-action-menu border border-edge-muted bg-surface rounded-sm p-3"
use:clickOutside={() => setOpen(false)}
>
<div class="flex items-center gap-2">
diff --git a/apps/web/src/features/block-canvas/component/FloatingMenu.tsx b/apps/web/src/features/block-canvas/component/FloatingMenu.tsx
index 7a04dec8e0..7679bb9432 100644
--- a/apps/web/src/features/block-canvas/component/FloatingMenu.tsx
+++ b/apps/web/src/features/block-canvas/component/FloatingMenu.tsx
@@ -228,7 +228,7 @@ function MobileDeleteButton() {
return (
<Show when={selection.active() && isMobileWidth()}>
- <div class="max-h-12 flex p-2 bg-surface cursor-auto justify-center items-center rounded shadow-md ring ring-edge">
+ <div class="max-h-12 flex p-2 bg-surface cursor-auto justify-center items-center rounded border border-edge shadow-md">
<Button
variant="ghost"
size="icon-md"
@@ -487,7 +487,7 @@ export function FloatingMenu() {
>
<div
class={cn(
- 'flex bg-surface rounded-lg shadow-lg ring ring-edge',
+ 'flex bg-surface rounded-lg border border-edge shadow-lg',
isMobileWidth() ? 'flex-row p-2 mr-2' : 'flex-col w-54 p-3',
selectedNodes().length + selectedEdges().length <= 1 &&
validMenus().size === 0 &&
diff --git a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
index 8122c24aff..d13ca2a881 100644
--- a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
+++ b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
@@ -89,7 +89,7 @@ export function CodeFileTypeChip() {
{fileType()}
</Popover.Trigger>
<Popover.Portal>
- <Popover.Content class="z-action-menu w-48 rounded shadow-md ring ring-edge bg-surface text-ink text-sm overflow-hidden">
+ <Popover.Content class="z-action-menu w-48 rounded border border-edge bg-surface text-ink text-sm shadow-md overflow-hidden">
<div class="p-1.5 border-b border-edge">
<input
ref={searchRef}
diff --git a/apps/web/src/features/block-email/component/CollapsedMessage.tsx b/apps/web/src/features/block-email/component/CollapsedMessage.tsx
index 00f660f531..c1534efec3 100644
--- a/apps/web/src/features/block-email/component/CollapsedMessage.tsx
+++ b/apps/web/src/features/block-email/component/CollapsedMessage.tsx
@@ -60,10 +60,10 @@ export function CollapsedMessage(props: CollapsedMessageProps) {
<div class="macro-message-width macro-message-padding w-full">
<div
class={cn(
- 'relative flex flex-col gap-2 p-4 rounded-lg min-w-0 ring',
+ 'relative flex flex-col gap-2 p-4 rounded-lg min-w-0 border',
props.isFocused
- ? 'bg-active/60 ring-edge'
- : 'bg-ink-muted/2.5 hover:bg-active/40 hover:ring-edge ring-transparent'
+ ? 'bg-active/60 border-edge'
+ : 'bg-ink-muted/2.5 hover:bg-active/40 hover:border-edge border-transparent'
)}
style={{
'--user-icon-width': '1rem',
diff --git a/apps/web/src/features/block-email/component/Email.tsx b/apps/web/src/features/block-email/component/Email.tsx
index 28fe583b88..8025c283cb 100644
--- a/apps/web/src/features/block-email/component/Email.tsx
+++ b/apps/web/src/features/block-email/component/Email.tsx
@@ -809,7 +809,7 @@ function EmailTaskButton(props: { onClick: () => void }) {
onMouseLeave={() => setHovering(false)}
onClick={props.onClick}
depth={2}
- class="gap-1.5 rounded-full px-2 text-ink-extra-muted ring ring-edge-muted"
+ class="gap-1.5 rounded-full border border-edge-muted px-2 text-ink-extra-muted"
>
<AnimatedTaskIcon triggerAnimation={hovering()} />
<span class="text-xs font-semibold">Task</span>
diff --git a/apps/web/src/features/block-email/component/MessageContainer.tsx b/apps/web/src/features/block-email/component/MessageContainer.tsx
index 601cbbf99a..3d697517c1 100644
--- a/apps/web/src/features/block-email/component/MessageContainer.tsx
+++ b/apps/web/src/features/block-email/component/MessageContainer.tsx
@@ -225,12 +225,12 @@ export function MessageContainer(props: MessageContainerProps) {
<div class="shrink-0 flex justify-center w-full">
<div class="macro-message-width macro-message-padding w-full">
<div
- class="relative rounded-lg overflow-hidden p-4 ring"
+ class="relative rounded-lg overflow-hidden p-4 border"
style={{ '--user-icon-width': '1rem' }}
classList={{
- 'bg-accent ring-transparent': props.isTarget,
- 'bg-active/60 ring-edge': !props.isTarget && props.isFocused,
- 'bg-ink-muted/4 ring-transparent':
+ 'bg-accent border-transparent': props.isTarget,
+ 'bg-active/60 border-edge': !props.isTarget && props.isFocused,
+ 'bg-ink-muted/4 border-transparent':
!props.isTarget && !props.isFocused,
}}
data-message-body-id={props.message.db_id}
diff --git a/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx b/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
index 33472db922..34014d6485 100644
--- a/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
+++ b/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
@@ -238,7 +238,7 @@ export function DispatchAgentButton(
variant="ghost"
size={props.showPrimaryLabel ? 'sm' : 'icon-sm'}
depth={2}
- class="rounded-full ring ring-edge-muted"
+ class="rounded-full border border-edge-muted"
>
<Button
onClick={executeLastUsed}
diff --git a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
index 825dbcf868..042bc0c2b6 100644
--- a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
+++ b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
@@ -99,7 +99,7 @@ export function DocumentAiEditBar(props: { documentId: string }) {
variant="ghost"
size="sm"
depth={2}
- class="gap-1.5 rounded-full px-2.5 ring ring-edge-muted"
+ class="gap-1.5 rounded-full border border-edge-muted px-2.5"
>
<span
class="flex size-4 shrink-0 items-center justify-center"
diff --git a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
index 8e20e791ee..a6d62391c6 100644
--- a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
+++ b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
@@ -46,7 +46,7 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (
<Layer depth={2}>
<Property.EditTrigger
class={cn(
- 'inline-flex items-center gap-1.5 min-w-0 ring ring-edge-muted',
+ 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted',
'px-2 py-1 leading-tight text-left rounded-full',
'bg-surface',
'focus-visible:bg-active focus-visible:ring-accent/10',
diff --git a/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx b/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
index a9e999badd..0be9ee0b0b 100644
--- a/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
+++ b/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
@@ -11,7 +11,7 @@ import { cn } from '@ui/utils/classname';
import { createMemo, For, type JSX, Show, Suspense } from 'solid-js';
const PILL_CLASS = cn(
- 'inline-flex items-center gap-1.5 min-w-0 ring ring-edge-muted',
+ 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted',
'px-2 py-1 leading-tight text-left rounded-full',
'bg-surface text-ink-muted hover:bg-hover hover:text-ink',
'focus-visible:outline-none focus-visible:ring-accent/20'
diff --git a/apps/web/src/features/block-md/component/MarkdownOutline.tsx b/apps/web/src/features/block-md/component/MarkdownOutline.tsx
index 25ea7aa55d..4733c61a84 100644
--- a/apps/web/src/features/block-md/component/MarkdownOutline.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownOutline.tsx
@@ -216,7 +216,7 @@ export function MarkdownOutline(props: {
<HoverCard
closeDelay={0}
content={
- <div class="max-h-[calc(100vh-6rem)] w-52 overflow-y-auto rounded-xl bg-surface p-2 shadow-menu ring ring-edge">
+ <div class="max-h-[calc(100vh-6rem)] w-52 overflow-y-auto rounded-xl border border-edge bg-surface p-2 shadow-menu">
<For each={props.outline.headings()}>
{(heading) => (
<OutlineItem
diff --git a/apps/web/src/features/block-md/component/MarkdownPopup.tsx b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
index c2c7a26040..db91c5cc7a 100644
--- a/apps/web/src/features/block-md/component/MarkdownPopup.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
@@ -639,7 +639,7 @@ export function MarkdownPopup(props: {
</p>
<div class="flex flex-row items-center space-x-2 w-full px-2">
<textarea
- class="resize-none rounded-xs w-full p-2 my-3 text-sm h-max-[800px] overflow-hidden ring ring-edge bg-hover"
+ class="resize-none rounded-xs w-full p-2 my-3 text-sm h-max-[800px] overflow-hidden border border-edge bg-hover"
ref={setRewriteInputRef}
rows={1}
onSubmit={(e) => e.preventDefault()}
diff --git a/apps/web/src/features/block-md/component/TaskCopyBranchButton.tsx b/apps/web/src/features/block-md/component/TaskCopyBranchButton.tsx
index fe86c28c3e..9cfa4b7641 100644
--- a/apps/web/src/features/block-md/component/TaskCopyBranchButton.tsx
+++ b/apps/web/src/features/block-md/component/TaskCopyBranchButton.tsx
@@ -19,7 +19,10 @@ export function TaskCopyBranchButton(props: {
depth={2}
tooltip={showLabel() ? undefined : 'Copy branch name'}
hotkey={TOKENS.entity.action.copyBranchName}
- class={cn('gap-1.5 rounded-full px-2 ring ring-edge-muted', props.class)}
+ class={cn(
+ 'gap-1.5 rounded-full border border-edge-muted px-2',
+ props.class
+ )}
onClick={() => void copyBranchNameToClipboard(blockId)}
>
<GitBranch class="size-3.5" />
diff --git a/apps/web/src/features/block-md/history/UserHoverTag.tsx b/apps/web/src/features/block-md/history/UserHoverTag.tsx
index 6d935a3552..2b18915198 100644
--- a/apps/web/src/features/block-md/history/UserHoverTag.tsx
+++ b/apps/web/src/features/block-md/history/UserHoverTag.tsx
@@ -10,7 +10,7 @@ export function UserHoverTag(props: {
}) {
return (
<div
- class="pointer-events-none absolute z-30 flex items-center gap-1.5 rounded-md bg-surface px-2 py-1 text-ink text-xs shadow-lg ring ring-edge-muted"
+ class="pointer-events-none absolute z-30 flex items-center gap-1.5 rounded-md border border-edge-muted bg-surface px-2 py-1 text-ink text-xs shadow-lg"
style={{ left: `${props.left}px`, top: `${props.top}px` }}
>
<span
diff --git a/apps/web/src/features/block-pr/component/PrSplitHeader.tsx b/apps/web/src/features/block-pr/component/PrSplitHeader.tsx
index 116f272e71..ba208abc45 100644
--- a/apps/web/src/features/block-pr/component/PrSplitHeader.tsx
+++ b/apps/web/src/features/block-pr/component/PrSplitHeader.tsx
@@ -39,7 +39,7 @@ function capitalize(value: string): string {
/** Pill surface matching the task block's inline property pills. */
export const PR_PILL_CLASS =
- 'inline-flex items-center gap-1.5 min-w-0 ring ring-edge-muted px-2 py-1 leading-tight text-left rounded-full bg-surface';
+ 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted px-2 py-1 leading-tight text-left rounded-full bg-surface';
export function PrStatusIcon(props: { status: string; class?: string }) {
return (
diff --git a/apps/web/src/features/block-pr/side-panel/github-pull-request.tsx b/apps/web/src/features/block-pr/side-panel/github-pull-request.tsx
index f1bb4ff32c..e73aa1735e 100644
--- a/apps/web/src/features/block-pr/side-panel/github-pull-request.tsx
+++ b/apps/web/src/features/block-pr/side-panel/github-pull-request.tsx
@@ -31,7 +31,7 @@ const STATUS_TEXT_CLASS: Record<string, string> = {
};
const PR_PILL_CLASS =
- 'inline-flex items-center gap-1.5 min-w-0 ring ring-edge-muted px-2 py-1 leading-tight text-left rounded-full bg-surface';
+ 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted px-2 py-1 leading-tight text-left rounded-full bg-surface';
function capitalize(value: string): string {
return value.charAt(0).toUpperCase() + value.slice(1);
diff --git a/apps/web/src/features/channel/CreateChannelModal.tsx b/apps/web/src/features/channel/CreateChannelModal.tsx
index 30f18d459d..0b5ba7768e 100644
--- a/apps/web/src/features/channel/CreateChannelModal.tsx
+++ b/apps/web/src/features/channel/CreateChannelModal.tsx
@@ -227,7 +227,7 @@ export function CreateChannelModal() {
({teamMembers().length})
</span>
</div>
- <div class="relative max-h-56 rounded-lg ring ring-edge-muted">
+ <div class="relative max-h-56 rounded-lg border border-edge-muted">
<div
ref={setTeamListScrollRef}
class="scrollbar-hidden max-h-56 overflow-y-auto"
diff --git a/apps/web/src/features/channel/Message/ActionMenu.tsx b/apps/web/src/features/channel/Message/ActionMenu.tsx
index d8a0b7d6ad..e8cd980c5f 100644
--- a/apps/web/src/features/channel/Message/ActionMenu.tsx
+++ b/apps/web/src/features/channel/Message/ActionMenu.tsx
@@ -140,7 +140,7 @@ export function ActionMenu(props: ActionMenuProps) {
<HoverActions class={props.class} persistentVisible={emojiMenuOpen()}>
<Layer depth={2}>
<div
- class="flex flex-row bg-surface ring ring-edge p-1 shadow items-center rounded-md"
+ class="flex flex-row bg-surface border border-edge p-1 shadow items-center rounded-md"
onClick={(e) => e.stopPropagation()}
>
<Show when={hasReactAction()}>
diff --git a/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx b/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
index b5b5b71c34..3ad2f705d3 100644
--- a/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
+++ b/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
@@ -31,7 +31,7 @@ export function ChannelCreatedIndicator(props: ChannelCreatedIndicatorProps) {
edge so it meets the thread rail on the message below. Sits behind
the avatar (which has a solid bg), so it only shows below it. */}
<div
- class="pointer-events-none absolute bottom-0 -z-1 border-l border-rail"
+ class="pointer-events-none absolute bottom-0 -z-1 border-l-1 border-rail"
style={{
left: 'var(--left-of-connector)',
top: 'calc(1rem + var(--user-icon-width) / 2)',
diff --git a/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx b/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
index fab845b83f..d3fae288cf 100644
--- a/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
+++ b/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
@@ -49,7 +49,7 @@ export function EmojiReactionPopover(props: EmojiReactionPopoverProps) {
<Popover.Content class="z-modal">
<Popover.Arrow class="fill-surface" />
<div
- class="w-64.5 h-78.75 pl-2 pt-2 rounded-md flex flex-col bg-surface shadow-lg ring ring-edge"
+ class="w-64.5 h-78.75 pl-2 pt-2 rounded-md flex flex-col border border-edge bg-surface shadow-lg"
role="dialog"
aria-label="Emoji search"
>
diff --git a/apps/web/src/features/channel/Message/ReactionChip.tsx b/apps/web/src/features/channel/Message/ReactionChip.tsx
index 733cdd1123..7c2fb98dba 100644
--- a/apps/web/src/features/channel/Message/ReactionChip.tsx
+++ b/apps/web/src/features/channel/Message/ReactionChip.tsx
@@ -114,7 +114,7 @@ export function ReactionChip(props: ReactionChipProps) {
</HoverCard>
</Popover.Anchor>
<Popover.Portal>
- <Popover.Content class="z-modal bg-surface p-1.5 text-ink-muted text-xs rounded-sm ring ring-edge-muted">
+ <Popover.Content class="z-modal border border-edge-muted bg-surface p-1.5 text-ink-muted text-xs rounded-sm">
<ReactionTooltipContent
users={props.users}
currentUserId={props.currentUserId}
diff --git a/apps/web/src/features/channel/Thread/ThreadReplyInputConnector.tsx b/apps/web/src/features/channel/Thread/ThreadReplyInputConnector.tsx
index 07fcaf1dd2..55ea5bdb73 100644
--- a/apps/web/src/features/channel/Thread/ThreadReplyInputConnector.tsx
+++ b/apps/web/src/features/channel/Thread/ThreadReplyInputConnector.tsx
@@ -11,7 +11,7 @@ export function ThreadReplyInputConnector() {
<>
{/* Short vertical rail segment from wrapper top to connector start */}
<div
- class="absolute border-l border-rail top-0"
+ class="absolute border-l-1 border-rail top-0"
style={{
left: 'calc((var(--user-icon-width) / 2) * -1)',
height:
diff --git a/apps/web/src/features/channel/Thread/ThreadTypingIndicator.tsx b/apps/web/src/features/channel/Thread/ThreadTypingIndicator.tsx
index f398faf6f0..eda17137d9 100644
--- a/apps/web/src/features/channel/Thread/ThreadTypingIndicator.tsx
+++ b/apps/web/src/features/channel/Thread/ThreadTypingIndicator.tsx
@@ -47,7 +47,7 @@ function ThreadTypingIndicatorContent(
}
function ThreadTypingIndicatorConnector() {
- return <div class="w-7 border-b border-rail" />;
+ return <div class="w-7 border-b-1 border-rail" />;
}
function ThreadTypingIndicatorDots() {
diff --git a/apps/web/src/features/chat/ChatWithAgentButton.tsx b/apps/web/src/features/chat/ChatWithAgentButton.tsx
index 6cc077e8cb..af8be78a42 100644
--- a/apps/web/src/features/chat/ChatWithAgentButton.tsx
+++ b/apps/web/src/features/chat/ChatWithAgentButton.tsx
@@ -130,7 +130,7 @@ export function AskMacroButton(props: { entity: ChatWithAgentEntity }) {
variant="ghost"
size="sm"
depth={2}
- class="gap-1.5 rounded-full px-2 ring ring-edge-muted"
+ class="gap-1.5 rounded-full border border-edge-muted px-2"
>
<AnimatedStarIcon triggerAnimation={hovering()} />
<span class="text-xs font-medium">Ask Macro</span>
diff --git a/apps/web/src/features/command/Launcher.tsx b/apps/web/src/features/command/Launcher.tsx
index c788c7a922..9496072290 100644
--- a/apps/web/src/features/command/Launcher.tsx
+++ b/apps/web/src/features/command/Launcher.tsx
@@ -503,7 +503,7 @@ const LauncherMenuItem = (props: LauncherMenuItemProps) => {
<Layer depth={4}>
<button
class={cn(
- 'size-28 shadow-sm shadow-drop-shadow relative flex flex-col sm:gap-4 gap-2 items-center isolate justify-center bg-surface ring ring-edge transition-transform ease-click duration-200 rounded-sm',
+ 'size-28 shadow-sm shadow-drop-shadow relative flex flex-col sm:gap-4 gap-2 items-center isolate justify-center border border-edge bg-surface transition-transform ease-click duration-200 rounded-sm',
`create-menu-${props.creatableBlock.label.toLowerCase()}`,
{
'-translate-y-2 text-ink': props.focused,
@@ -807,10 +807,10 @@ export const LauncherInner = (props: LauncherInnerProps) => {
/>
<span
class={cn(
- 'ring text-xs px-1.5 py-0.5 rounded-sm transition-colors duration-150',
+ 'border text-xs px-1.5 py-0.5 rounded-sm transition-colors duration-150',
shiftHeld()
- ? 'ring-accent text-accent bg-accent/10'
- : 'ring-edge-muted'
+ ? 'border-accent text-accent bg-accent/10'
+ : 'border-edge-muted'
)}
>
{getNormalizedKeyString({ shortcut: 'shift' })}
diff --git a/apps/web/src/features/entity/composed/list-entity/foreign.tsx b/apps/web/src/features/entity/composed/list-entity/foreign.tsx
index ed34f425ec..15aad74186 100644
--- a/apps/web/src/features/entity/composed/list-entity/foreign.tsx
+++ b/apps/web/src/features/entity/composed/list-entity/foreign.tsx
@@ -28,7 +28,7 @@ function Pill(props: PillProps) {
return (
<span
class={cn(
- 'min-w-0 rounded-full inline-flex items-center gap-1 px-1.5 py-1 leading-tight text-xs font-medium ring ring-edge ring-inset bg-surface/50',
+ 'min-w-0 rounded-full inline-flex items-center gap-1 px-1.5 py-1 leading-tight text-xs font-medium border border-edge bg-surface/50',
props.class
)}
>
@@ -365,7 +365,7 @@ function GithubPullRequestChecksPopover(props: {
<Layer depth={5}>
<span
class={cn(
- 'absolute right-1.5 top-1/2 z-10 inline-flex size-5 -translate-y-1/2 items-center justify-center rounded-md bg-active text-ink-extra-muted opacity-0 shadow-sm ring ring-edge-muted',
+ 'absolute right-1.5 top-1/2 z-10 inline-flex size-5 -translate-y-1/2 items-center justify-center rounded-md border border-edge-muted bg-active text-ink-extra-muted opacity-0 shadow-sm',
hasUrl() && 'group-hover/check-card:opacity-100'
)}
>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
index b3b65550c4..93104454be 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
@@ -272,7 +272,7 @@ export const SearchableMultiSelect = (props: SearchableMultiSelectProps) => {
<Layer depth={2}>
<Combobox.Content
class={cn(
- 'z-action-menu bg-surface ring ring-edge-muted rounded-xl shadow-md w-65 max-w-[90vw] overflow-hidden',
+ 'z-action-menu border border-edge-muted bg-surface rounded-xl shadow-md w-65 max-w-[90vw] overflow-hidden',
props.contentClass
)}
>
diff --git a/apps/web/src/features/onboarding/MobileWebWelcome.tsx b/apps/web/src/features/onboarding/MobileWebWelcome.tsx
index c140fe31e1..e0a8ecf668 100644
--- a/apps/web/src/features/onboarding/MobileWebWelcome.tsx
+++ b/apps/web/src/features/onboarding/MobileWebWelcome.tsx
@@ -71,7 +71,7 @@ export default function MobileWebWelcome(props: MobileWebWelcomeProps) {
<A
href="/login"
onClick={() => analytics.track('login_from_onboarding')}
- class="w-full px-3 py-2.5 text-lg rounded-xs flex items-center justify-between gap-2 border-none bg-transparent text-ink/50 hover:bg-hover/60 ring ring-edge-muted"
+ class="w-full px-3 py-2.5 text-lg rounded-xs flex items-center justify-between gap-2 border border-edge-muted bg-transparent text-ink/50 hover:bg-hover/60"
>
Login
</A>
diff --git a/apps/web/src/features/onboarding/OnboardingLesson.tsx b/apps/web/src/features/onboarding/OnboardingLesson.tsx
index 24975b2942..604a664b0e 100644
--- a/apps/web/src/features/onboarding/OnboardingLesson.tsx
+++ b/apps/web/src/features/onboarding/OnboardingLesson.tsx
@@ -65,7 +65,7 @@ export function OnboardingLessonActions(props: LessonActionsProps) {
type="button"
onClick={onboarding.handleSkipLesson}
class={cn(
- 'w-full px-3 py-2.5 text-lg font-bold rounded-xs flex items-center gap-2 border-none bg-transparent text-ink/60 hover:bg-hover ring ring-edge-muted',
+ 'w-full px-3 py-2.5 text-lg font-bold rounded-xs flex items-center gap-2 border border-edge-muted bg-transparent text-ink/60 hover:bg-hover',
props.lesson.definition.centeredButton
? 'justify-center'
: 'justify-between'
diff --git a/apps/web/src/features/onboarding/components-lib.tsx b/apps/web/src/features/onboarding/components-lib.tsx
index 6f6bf6da01..7261b55620 100644
--- a/apps/web/src/features/onboarding/components-lib.tsx
+++ b/apps/web/src/features/onboarding/components-lib.tsx
@@ -215,10 +215,10 @@ export function ContinueButton(props: ContinueButtonProps) {
ref={props.ref}
type="button"
class={cn(
- 'w-full px-3 py-2.5 text-lg font-bold rounded-xs flex items-center gap-2 border-none',
+ 'w-full px-3 py-2.5 text-lg font-bold rounded-xs flex items-center gap-2 border border-transparent',
props.centered ? 'justify-center' : 'justify-between',
{
- 'bg-transparent text-ink/40 font-normal ring ring-edge-muted':
+ 'bg-transparent text-ink/40 font-normal border border-edge-muted':
props.disabled,
'bg-accent text-surface hover:bg-accent/90': !props.disabled,
}
diff --git a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
index 796f41eb72..cfb743ee50 100644
--- a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
+++ b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
@@ -328,7 +328,7 @@ function AddPinnedPropertyButton() {
type="button"
onClick={openPropertySelector}
class={cn(
- 'inline-flex items-center gap-1.5 m-px ring ring-edge-muted bg-surface',
+ 'inline-flex items-center gap-1.5 m-px border border-edge-muted bg-surface',
'px-2 py-1 leading-tight rounded-full text-ink-muted',
'hover:bg-hover hover:text-ink transition-colors'
)}
diff --git a/apps/web/src/features/property/tags/EntityRowTags.tsx b/apps/web/src/features/property/tags/EntityRowTags.tsx
index d9f5678fa4..633850e01d 100644
--- a/apps/web/src/features/property/tags/EntityRowTags.tsx
+++ b/apps/web/src/features/property/tags/EntityRowTags.tsx
@@ -320,7 +320,7 @@ export function InlineTagsPill(props: {
<TagPicker
docTags={props.docTags}
triggerClass={cn(
- 'inline-flex items-center gap-1.5 min-w-0 ring ring-edge-muted',
+ 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted',
'px-2 py-1 leading-tight text-left rounded-full bg-surface',
'hover:bg-hover text-ink-muted focus-visible:bg-active focus-visible:ring-accent/10',
tags().length === 0 && 'text-ink-extra-muted',
diff --git a/apps/web/src/features/property/tags/TagPicker.tsx b/apps/web/src/features/property/tags/TagPicker.tsx
index 13e2aeee95..a959a02946 100644
--- a/apps/web/src/features/property/tags/TagPicker.tsx
+++ b/apps/web/src/features/property/tags/TagPicker.tsx
@@ -635,7 +635,7 @@ function TagPickerBody(props: {
<Popover.Portal>
<Layer depth={3}>
<Popover.Content
- class="z-modal w-64 rounded-xl bg-surface text-sm shadow-menu ring ring-edge-muted menu-open-animation"
+ class="z-modal w-64 rounded-xl border border-edge-muted bg-surface text-sm shadow-menu menu-open-animation"
onCloseAutoFocus={(event) => event.preventDefault()}
onFocusOutside={(event) => {
if (shouldIgnoreOutsideEvent()) event.preventDefault();
diff --git a/apps/web/src/features/property/tags/TagsRow.tsx b/apps/web/src/features/property/tags/TagsRow.tsx
index ec303c8452..90f59072b7 100644
--- a/apps/web/src/features/property/tags/TagsRow.tsx
+++ b/apps/web/src/features/property/tags/TagsRow.tsx
@@ -25,7 +25,7 @@ import { useDocTags } from './useDocTags';
const chipClass = cn(
'inline-flex items-center gap-1.5 m-px min-w-0 max-w-[30ch]',
- 'px-2 py-1 leading-tight rounded-full ring ring-edge-muted bg-surface',
+ 'px-2 py-1 leading-tight rounded-full border border-edge-muted bg-surface',
'text-ink-muted transition-colors hover:bg-hover hover:text-ink'
);
@@ -156,7 +156,7 @@ export function TagsRow(props: {
<TagPicker
docTags={docTags}
triggerClass={cn(
- 'inline-flex items-center gap-1.5 m-px ring ring-edge-muted bg-surface',
+ 'inline-flex items-center gap-1.5 m-px border border-edge-muted bg-surface',
'px-2 py-1 leading-tight rounded-full text-ink-muted',
'hover:bg-hover hover:text-ink transition-colors'
)}
@@ -171,7 +171,7 @@ export function TagsRow(props: {
docTags={docTags}
triggerClass={cn(
'inline-flex items-center justify-center rounded-full px-1 py-1 leading-tight',
- 'm-px ring ring-edge-muted bg-surface text-ink-muted',
+ 'm-px border border-edge-muted bg-surface text-ink-muted',
'transition-colors hover:bg-hover hover:text-ink'
)}
triggerLabel="Add tags"
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsx
index 689871c5a1..78401c9fdb 100644
--- a/apps/web/src/features/settings/Team.tsx
+++ b/apps/web/src/features/settings/Team.tsx
@@ -130,7 +130,7 @@ function RoleSelect(props: {
<CaretDownIcon class="size-3 text-ink-muted shrink-0" />
</Select.Trigger>
<Select.Portal>
- <Select.Content class="z-action-menu bg-surface ring ring-edge rounded shadow-lg min-w-25 p-1">
+ <Select.Content class="z-action-menu border border-edge bg-surface rounded shadow-lg min-w-25 p-1">
<Select.Listbox />
</Select.Content>
</Select.Portal>
diff --git a/apps/web/src/features/theme/components/ColorPickerPopover.tsx b/apps/web/src/features/theme/components/ColorPickerPopover.tsx
index 4c8dbc7dac..6cbb0a6e81 100644
--- a/apps/web/src/features/theme/components/ColorPickerPopover.tsx
+++ b/apps/web/src/features/theme/components/ColorPickerPopover.tsx
@@ -192,7 +192,7 @@ export function ColorPickerPopover(props: {
<Popover.Content class="z-modal">
<Popover.Arrow class="fill-surface" />
<div
- class="flex w-64 flex-col gap-3 rounded-xl bg-surface p-3 shadow-lg ring ring-edge-muted"
+ class="flex w-64 flex-col gap-3 rounded-xl border border-edge-muted bg-surface p-3 shadow-lg"
role="dialog"
aria-label={props.ariaLabel}
>
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index b134d4696b..e2ed29aaeb 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -57,8 +57,13 @@
@property --safe-right { syntax: "<length>"; inherits: true; initial-value: 0px; }
@property --safe-left { syntax: "<length>"; inherits: true; initial-value: 0px; }
@property --safe-top { syntax: "<length>"; inherits: true; initial-value: 0px; }
+@property --app-border-width { syntax: "<length>"; inherits: true; initial-value: 0.5px; }
+@property --app-ring-width { syntax: "<length>"; inherits: true; initial-value: 0.5px; }
:root {
+ --app-border-width: 0.5px;
+ --app-ring-width: 0.5px;
+
/* mobile safe areas */
--safe-bottom: max(env(safe-area-inset-bottom, 0px), var(--tauri-inset-bottom, 0px));
--safe-right: max(env(safe-area-inset-right, 0px), var(--tauri-inset-right, 0px));
@@ -109,13 +114,26 @@
}
+html[data-platform='ios'],
+body.tauri-ios {
+ --app-border-width: 1px;
+ --app-ring-width: 1px;
+}
+
+@supports (-webkit-touch-callout: none) {
+ html {
+ --app-border-width: 1px;
+ --app-ring-width: 1px;
+ }
+}
+
@theme {
/* Disable default tailwind color palette */
--color-*: initial;
/* Match the hairline borders: make the default `ring` a 0.5px ring.
Explicit widths (ring, ring-2, …) are left untouched. */
- --default-ring-width: 0.5px;
+ --default-ring-width: var(--app-ring-width);
/* Semantic Color names, use these when writing tailwind */
--color-accent: var(--a0);
@@ -510,35 +528,35 @@ a {
}
/* Hairline borders app-wide. We override Tailwind's default 1px width utilities
- so every border renders at 0.5px, including single-side borders, without
- having to sprinkle a modifier on each element. Explicit widths (border-2,
- border-4, …) are intentionally left untouched. */
+ so every default border uses the configured app border width, including
+ single-side borders, without having to sprinkle a modifier on each element.
+ Explicit widths (border-2, border-4, …) are intentionally left untouched. */
@utility border {
- border-width: 0.5px;
+ border-width: var(--app-border-width);
}
@utility border-x {
- border-inline-width: 0.5px;
+ border-inline-width: var(--app-border-width);
}
@utility border-y {
- border-block-width: 0.5px;
+ border-block-width: var(--app-border-width);
}
@utility border-s {
- border-inline-start-width: 0.5px;
+ border-inline-start-width: var(--app-border-width);
}
@utility border-e {
- border-inline-end-width: 0.5px;
+ border-inline-end-width: var(--app-border-width);
}
@utility border-t {
- border-top-width: 0.5px;
+ border-top-width: var(--app-border-width);
}
@utility border-r {
- border-right-width: 0.5px;
+ border-right-width: var(--app-border-width);
}
@utility border-b {
- border-bottom-width: 0.5px;
+ border-bottom-width: var(--app-border-width);
}
@utility border-l {
- border-left-width: 0.5px;
+ border-left-width: var(--app-border-width);
}
@utility hover-transition-bg {
diff --git a/apps/web/src/lib/core/comments/Thread.tsx b/apps/web/src/lib/core/comments/Thread.tsx
index 41a05228e6..1eb477f1ab 100644
--- a/apps/web/src/lib/core/comments/Thread.tsx
+++ b/apps/web/src/lib/core/comments/Thread.tsx
@@ -202,7 +202,7 @@ export function Thread(props: {
<div
// note: pdf-pointer-event-reset is a strange one-off class that mostly normalizes
// pointer-events: none vs. all inside the .pdfOverlayInner div.
- class="shrink-0 bg-surface p-2 ring ring-edge shadow-md rounded-xl shadow-drop-shadow portal-scope pointer-events-auto pdf-pointer-event-reset"
+ class="shrink-0 border border-edge bg-surface p-2 shadow-md rounded-xl shadow-drop-shadow portal-scope pointer-events-auto pdf-pointer-event-reset"
classList={{
'transition-transform duration-100': true,
'-translate-x-8': props.isActive,
diff --git a/apps/web/src/lib/core/component/AI/component/InlineAi.tsx b/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
index 1dcaf37457..a7d9b42c35 100644
--- a/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
+++ b/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
@@ -49,7 +49,7 @@ export function InlineInputReady(props: InlineInputReadyProps) {
});
return (
- <div class="relative flex items-end justify-between p-2 ring ring-edge rounded-xs w-full bg-hover">
+ <div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
class="flex resize-none w-full p-1 text-sm h-max-[800px] overflow-hidden"
ref={inputRef}
@@ -107,7 +107,7 @@ type InlineInputLoadingProps = {
export function InlineInputLoading(props: InlineInputLoadingProps) {
return (
- <div class="relative flex items-end justify-between p-2 ring ring-edge rounded-xs w-full bg-hover">
+ <div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
class="flex resize-none rounded-md w-full p-1 text-sm h-max-[800px] overflow-hidden select-none"
disabled
@@ -126,7 +126,7 @@ export function InlineInputLoading(props: InlineInputLoadingProps) {
export function InlineInputDisabled(props: InlineInputLoadingProps) {
return (
- <div class="relative flex items-end justify-between p-2 ring ring-edge rounded-xs w-full bg-hover">
+ <div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
class="flex resize-none rounded-md w-full p-1 text-sm h-max-[800px] overflow-hidden select-none"
disabled
diff --git a/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx b/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx
index ef2bbf33bc..a1e8e1df06 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx
@@ -94,7 +94,7 @@ function DraftPreviewButton(props: {
return (
<button
- class="text-ink text-xs ring ring-edge-muted rounded-xs hover:bg-surface-hover flex flex-row h-6 px-2 justify-center items-center"
+ class="text-ink text-xs border border-edge-muted rounded-xs hover:bg-surface-hover flex flex-row h-6 px-2 justify-center items-center"
onClick={() =>
replaceOrInsertSplit({
...(props.threadId
diff --git a/apps/web/src/lib/core/component/ContextMenu.tsx b/apps/web/src/lib/core/component/ContextMenu.tsx
index edcecd8521..9dc8f11a33 100644
--- a/apps/web/src/lib/core/component/ContextMenu.tsx
+++ b/apps/web/src/lib/core/component/ContextMenu.tsx
@@ -307,7 +307,7 @@ const menuWidths: Record<MenuWidth, string> = {
screen: 'w-screen',
};
-export const MENU_CONTENT_CLASS = `flex flex-col justify-start items-start bg-surface shadow-menu ring ring-edge rounded-xl p-1.5 cursor-default select-none max-w-full max-h-[calc(100dvh-10rem)] overflow-y-auto z-modal menu-open-animation`;
+export const MENU_CONTENT_CLASS = `flex flex-col justify-start items-start border border-edge bg-surface shadow-menu rounded-xl p-1.5 cursor-default select-none max-w-full max-h-[calc(100dvh-10rem)] overflow-y-auto z-modal menu-open-animation`;
type MenuContentProps = ParentProps<{
class?: string;
diff --git a/apps/web/src/lib/core/component/DatePicker/index.tsx b/apps/web/src/lib/core/component/DatePicker/index.tsx
index d068242413..14d1cfd9fe 100644
--- a/apps/web/src/lib/core/component/DatePicker/index.tsx
+++ b/apps/web/src/lib/core/component/DatePicker/index.tsx
@@ -15,7 +15,7 @@ type DatePickerProps = {
export function DatePicker(props: DatePickerProps) {
return (
<div
- class="absolute z-action-menu bg-surface ring ring-edge-muted font-mono text-sm"
+ class="absolute z-action-menu border border-edge-muted bg-surface font-mono text-sm"
use:floatWithElement={{ element: () => props.anchorRef }}
use:clickOutside={props.onClose}
>
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index c377818f21..92688ba905 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -425,7 +425,7 @@ function PreviewPropertyPill(props: {
<Layer depth={2}>
<div
class={cn(
- 'inline-flex items-center gap-1.5 min-w-0 max-w-full ring ring-edge-muted',
+ 'inline-flex items-center gap-1.5 min-w-0 max-w-full border border-edge-muted',
'px-2 py-1 leading-tight text-left rounded-full bg-surface'
)}
>
diff --git a/apps/web/src/lib/core/component/GeneralizedPopup/Popup.tsx b/apps/web/src/lib/core/component/GeneralizedPopup/Popup.tsx
index 483613d1c7..57f5de0170 100644
--- a/apps/web/src/lib/core/component/GeneralizedPopup/Popup.tsx
+++ b/apps/web/src/lib/core/component/GeneralizedPopup/Popup.tsx
@@ -70,7 +70,7 @@ export function GeneralizedPopup(props: GeneralizedPopupProps) {
<div
ref={mergeRefs(setPopupRef, props.ref)}
id="generalized-popup"
- class="absolute bg-surface shadow-xl ring ring-edge rounded-lg z-highlight-menu inline-flex items-start flex-col p-1"
+ class="absolute border border-edge bg-surface shadow-xl rounded-lg z-highlight-menu inline-flex items-start flex-col p-1"
style={{
left: `${position().x}px`,
top: `${position().y}px`,
diff --git a/apps/web/src/lib/core/component/ItemPreview.tsx b/apps/web/src/lib/core/component/ItemPreview.tsx
index 7fe10533f3..f7ab1ab271 100644
--- a/apps/web/src/lib/core/component/ItemPreview.tsx
+++ b/apps/web/src/lib/core/component/ItemPreview.tsx
@@ -117,7 +117,7 @@ export function useItemPreviewData(entity: Accessor<ItemEntity>) {
}
const DEFAULT_BUTTON_CLASS =
- 'text-ink-base text-sm ring ring-edge-muted rounded-xs hover:bg-surface-hover flex flex-row h-6 px-2 justify-center items-center';
+ 'text-ink-base text-sm border border-edge-muted rounded-xs hover:bg-surface-hover flex flex-row h-6 px-2 justify-center items-center';
const DEFAULT_ICON_CLASS = 'flex justify-start items-center w-3.5 h-3.5 mr-2';
const DEFAULT_TEXT_CLASS = 'flex-1 text-left leading-5 min-w-0 truncate';
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/LinkWithPreview.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/LinkWithPreview.tsx
index c168ecb986..bee353f560 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/LinkWithPreview.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/LinkWithPreview.tsx
@@ -57,7 +57,7 @@ export function LinkWithPreview(props: UnfurlLinkProps) {
<Show when={previewOpen()}>
<ScopedPortal>
<div
- class="absolute bg-surface rounded-xs ring ring-edge-muted border-edge left-0 z-10 shadow-lg max-w-72"
+ class="absolute bg-surface rounded-xs border border-edge-muted left-0 z-10 shadow-lg max-w-72"
style={{
transform: 'translateY(0)',
}}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ContactMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ContactMention.tsx
index 6a896b7067..434e196364 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ContactMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ContactMention.tsx
@@ -131,7 +131,7 @@ export function ContactMention(props: ContactMentionDecoratorProps) {
<Show when={popupOpen()}>
<Portal>
<div
- class="absolute select-none overflow-hidden z-toast-region w-64 bg-surface ring ring-edge text-ink rounded-lg p-3"
+ class="absolute select-none overflow-hidden z-toast-region w-64 border border-edge bg-surface text-ink rounded-lg p-3"
use:floatWithElement={{ element: () => mentionRef }}
>
<div class="flex items-center gap-2">
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
index c05a30599f..3232bc996b 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
@@ -87,7 +87,7 @@ export function MediaButtons(props: MediaButtonsProps) {
return (
<Layer depth={3}>
- <div class="absolute bg-surface ring ring-edge rounded-md top-2 right-2 flex flex-row p-1">
+ <div class="absolute border border-edge bg-surface rounded-md top-2 right-2 flex flex-row p-1">
<Show when={!collapsed()}>
<ButtonContent />
</Show>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingEquationMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingEquationMenu.tsx
index 60e7101a78..ed995c0d10 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingEquationMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingEquationMenu.tsx
@@ -219,7 +219,7 @@ export function FloatingEquationMenu() {
return (
<Show when={menuOpen()}>
<div
- class="p-4 fixed bg-surface top-0 left-0 z-action-menu rounded-lg shadow-lg w-96 ring ring-edge"
+ class="p-4 fixed border border-edge bg-surface top-0 left-0 z-action-menu rounded-lg shadow-lg w-96"
use:floatWithElement={{ element: getElement }}
use:floatWithSelection={{
selection: untrack(getSelection),
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
index 0960c52b8d..76419b341d 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
@@ -229,7 +229,7 @@ export function FloatingFormatMenu(props: {
<Layer depth={2}>
<div
ref={setMenuRef}
- class="fixed top-0 left-0 z-highlight-menu bg-surface shadow-xl ring ring-edge rounded-lg p-1 flex flex-row items-center gap-1"
+ class="fixed top-0 left-0 z-highlight-menu border border-edge bg-surface shadow-xl rounded-lg p-1 flex flex-row items-center gap-1"
use:floatWithSelection={{
selection: domSelection(),
reactiveOnContainer: editor.getRootElement(),
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx
index a895ddf0f1..65d563e6f0 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx
@@ -357,7 +357,7 @@ export function FloatingLinkMenu(props: {
<Show when={linkInfo()?.linkRef || linkInfo()?.selection}>
<ScopedPortal scope="block">
<div
- class="p-2 fixed bg-surface top-0 left-0 text-sm z-modal-content ring ring-edge-muted rounded-sm shadow-lg min-w-80"
+ class="p-2 fixed border border-edge-muted bg-surface top-0 left-0 text-sm z-modal-content rounded-sm shadow-lg min-w-80"
use:floatWithElement={floatWithElementProps()}
use:floatWithSelection={floatWithSelectionProps()}
use:clickOutside={() => {
@@ -380,7 +380,7 @@ export function FloatingLinkMenu(props: {
{(link) => (
<ScopedPortal>
<div
- class="p-2 absolute top-0 left-0 z-10 bg-surface w-80 shadow-lg ring-edge-muted rounded-sm ring"
+ class="p-2 absolute top-0 left-0 z-10 border border-edge-muted bg-surface w-80 shadow-lg rounded-sm"
use:floatWithElement={{
element: () => link().linkRef,
useBlockBoundary: true,
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/GenerateMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/GenerateMenu.tsx
index e8952705c5..d6af4a26cd 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/GenerateMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/GenerateMenu.tsx
@@ -101,7 +101,7 @@ function GenerateActionMenu(props: GenerateMenuProps) {
});
return (
- <div class="w-fit flex flex-col ring ring-edge rounded-md p-1 bg-surface shadow-md space-y-1">
+ <div class="w-fit flex flex-col border border-edge rounded-md p-1 bg-surface shadow-md space-y-1">
<MenuItem
onClick={() => {
props.editor.dispatchCommand(ACCEPT_COMPLETION, undefined);
diff --git a/apps/web/src/lib/core/component/Message.tsx b/apps/web/src/lib/core/component/Message.tsx
index f93daeb41a..7c0d787b96 100644
--- a/apps/web/src/lib/core/component/Message.tsx
+++ b/apps/web/src/lib/core/component/Message.tsx
@@ -176,7 +176,7 @@ const NestedConnectorLines: Component<NestedConnectorLinesProps> = (props) => {
for (let i = 0; i < (props.threadDepth ?? 0); i++) {
NestedLines.push(
<div
- class="absolute h-full border-l"
+ class="absolute h-full border-l-1"
classList={{
'border-accent': props.isParentNewMessage,
'border-rail': !props.isParentNewMessage,
@@ -261,7 +261,7 @@ const Root: Component<MessageRootProps> = (props) => {
'relative flex flex-col pl-[calc(var(--user-icon-width)/2+var(--message-padding-x))] ml-(--left-of-connector)',
!props.hideConnectors &&
(!props.isLastMessage || props.hasReplyInputBelow) &&
- 'border-l',
+ 'border-l-1',
props.isNewMessage ? 'border-accent' : 'border-rail',
!(
props.isConsecutive ||
@@ -417,7 +417,7 @@ const Root: Component<MessageRootProps> = (props) => {
ref={(el) => props.setThreadAppendMountTarget?.(el)}
>
<div
- class="absolute border-l border-rail"
+ class="absolute border-l-1 border-rail"
style={{
left: `calc((var(--user-icon-width) / 2) * -1)`,
height:
diff --git a/apps/web/src/lib/core/component/OldMenu.tsx b/apps/web/src/lib/core/component/OldMenu.tsx
index 4e4d30f0c9..437b8e7041 100644
--- a/apps/web/src/lib/core/component/OldMenu.tsx
+++ b/apps/web/src/lib/core/component/OldMenu.tsx
@@ -242,7 +242,7 @@ export function OldMenu(props: ParentProps<OldMenuProps>) {
return (
<div
class={cn(
- 'flex flex-col py-1 justify-start items-start bg-surface shadow-lg rounded-md ring ring-edge cursor-default select-none',
+ 'flex flex-col py-1 justify-start items-start border border-edge bg-surface shadow-lg rounded-md cursor-default select-none',
props.width && (oldMenuWidths[props.width] ?? props.width),
isTouchDevice() && 'relative',
props.hide && 'hidden',
diff --git a/apps/web/src/lib/core/component/RecipientSelector.tsx b/apps/web/src/lib/core/component/RecipientSelector.tsx
index 774ab6fd7c..a6c419fea9 100644
--- a/apps/web/src/lib/core/component/RecipientSelector.tsx
+++ b/apps/web/src/lib/core/component/RecipientSelector.tsx
@@ -614,7 +614,7 @@ export function RecipientSelector<K extends CombinedRecipientKind>(
}
class={cn(
'ph-no-capture w-full text-sm offset-2 bg-surface rounded-2xl',
- !props.hideBorder && 'ring ring-edge',
+ !props.hideBorder && 'border border-edge',
!props.noPadding && 'p-2',
props.class
)}
@@ -855,7 +855,7 @@ export function RecipientSelector<K extends CombinedRecipientKind>(
inputRef()?.focus({ preventScroll: true });
}
}}
- class="z-modal-content bg-surface translate-y-1 border-edge p-2 rounded-xl shadow-lg shadow-drop-shadow ring ring-edge"
+ class="z-modal-content border border-edge bg-surface translate-y-1 p-2 rounded-xl shadow-lg shadow-drop-shadow"
>
<Combobox.Listbox
ref={setListboxRef}
diff --git a/apps/web/src/lib/core/component/TabsInset.tsx b/apps/web/src/lib/core/component/TabsInset.tsx
index bd752e3ecb..58ba7ae3c6 100644
--- a/apps/web/src/lib/core/component/TabsInset.tsx
+++ b/apps/web/src/lib/core/component/TabsInset.tsx
@@ -45,7 +45,7 @@ export const TabsInset = (props: TabsInsetProps) => {
class={cn('h-full flex items-center', local.class)}
>
<Layer depth={trackDepth()}>
- <div class="relative flex items-center bg-surface rounded-lg p-0.5 ring ring-edge-muted">
+ <div class="relative flex items-center border border-edge-muted bg-surface rounded-lg p-0.5">
<For each={local.list}>
{(item) => (
<Layer depth={itemDepth()}>
diff --git a/apps/web/src/lib/core/component/TabsInsetDropdown.tsx b/apps/web/src/lib/core/component/TabsInsetDropdown.tsx
index 61db3a13bb..5b05398933 100644
--- a/apps/web/src/lib/core/component/TabsInsetDropdown.tsx
+++ b/apps/web/src/lib/core/component/TabsInsetDropdown.tsx
@@ -41,7 +41,7 @@ export const TabsInsetDropdown = (props: TabsInsetDropdownProps) => {
<Dropdown.Trigger
class={cn(
'not-disabled:hover:bg-surface active:bg-surface focus-visible:bg-surface',
- 'h-auto p-0.5 rounded-lg border-0 ring ring-edge-muted bg-surface',
+ 'h-auto p-0.5 rounded-lg border border-edge-muted bg-surface',
local.class
)}
disabled={local.disabled}
diff --git a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
index 4b42904af8..2cc9766e19 100644
--- a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
+++ b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
@@ -1093,7 +1093,7 @@ function GlyphSidebar(props: GlyphSidebarProps) {
props.onGlyphRename(props.selectedGlyph, newName);
}
}}
- class="font-mono text-ink-muted text-sm text-left w-full ring ring-edge"
+ class="font-mono text-ink-muted text-sm text-left w-full border border-edge"
/>
<div class="size-32 flex items-center justify-center border border-edge bg-background">
<Show when={selectedPixels()}>