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.

fix(web): keep reading links the same color as the text (#9459)

Jacob Beckerman4a3725e88287
diff --git a/apps/web/src/components/app/side-panel/FileSidePanelSections.tsx b/apps/web/src/components/app/side-panel/FileSidePanelSections.tsx
index 8865de8b6d..612050a11b 100644
--- a/apps/web/src/components/app/side-panel/FileSidePanelSections.tsx
+++ b/apps/web/src/components/app/side-panel/FileSidePanelSections.tsx
@@ -187,8 +187,7 @@ export function FolderLink(props: { projectId: string; projectName: string }) {
<span
{...navHandlers}
class={
- SidePanel.pillClass +
- ' pointer-events-auto text-link hover:text-link-hover hover:bg-hover'
+ SidePanel.pillClass + ' pointer-events-auto text-ink hover:bg-hover'
}
>
<span class="truncate underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
diff --git a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
index 588e693fc2..ec8ff7d039 100644
--- a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
+++ b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
@@ -182,7 +182,7 @@ function FolderLink(props: { projectId: string; projectName: string }) {
return (
<span
{...navHandlers}
- class="pointer-events-auto min-w-0 truncate py-0.5 rounded-xs text-link hover:text-link-hover hover:bg-hover focus:bg-active"
+ class="pointer-events-auto min-w-0 truncate py-0.5 rounded-xs text-ink hover:bg-hover focus:bg-active"
>
<span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{props.projectName}
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 fd052dfc8e..a3f8195579 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
@@ -210,7 +210,7 @@ export function GithubPullRequestDetailsRows(props: {
href={props.enrichment.url}
target="_blank"
rel="noreferrer"
- class="min-w-0 truncate text-link hover:text-link-hover visited:text-link-visited underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2 hover:decoration-current"
+ class="min-w-0 truncate text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2 hover:decoration-current"
>
{props.enrichment.displayName}
</a>
@@ -248,7 +248,7 @@ export function GithubPullRequestChecksContent(props: {
target="_blank"
rel="noreferrer"
aria-label={`Open ${check.name} on GitHub`}
- class="text-link hover:text-link-hover visited:text-link-visited transition-colors"
+ class="text-ink-muted hover:text-ink transition-colors"
>
<ArrowSquareOut class="size-3" />
</a>
diff --git a/apps/web/src/features/calendar-team/components/team-event-details.tsx b/apps/web/src/features/calendar-team/components/team-event-details.tsx
index 4de4522570..6509449f22 100644
--- a/apps/web/src/features/calendar-team/components/team-event-details.tsx
+++ b/apps/web/src/features/calendar-team/components/team-event-details.tsx
@@ -80,7 +80,7 @@ export function TeamEventDetails(props: {
<Show when={description()}>
{(html) => (
<div
- class="select-text text-ink-muted [&_a]:text-accent [&_a]:underline"
+ class="select-text text-ink-muted [&_a]:underline"
innerHTML={html()}
onClick={(event) => {
const anchor = (event.target as Element | null)?.closest(
diff --git a/apps/web/src/features/calendar/components/EventDetails.tsx b/apps/web/src/features/calendar/components/EventDetails.tsx
index e323525879..5df73ac9e8 100644
--- a/apps/web/src/features/calendar/components/EventDetails.tsx
+++ b/apps/web/src/features/calendar/components/EventDetails.tsx
@@ -320,7 +320,7 @@ function EventLocationItem(props: { location: string }) {
{(segment) =>
segment.kind === 'phone' ? (
<a
- class="text-link hover:text-link-hover hover:underline"
+ class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2 hover:decoration-current"
href={segment.telUrl}
>
{segment.text}
@@ -605,7 +605,7 @@ export function EventDetails(props: {
<div class="contents">
<TextAlignLeftIcon class="mt-0.5 size-5 text-ink-extra-muted sm:size-4" />
<div
- class="select-text leading-relaxed text-ink-muted [&_a]:text-accent [&_a]:underline [&_ol]:list-decimal [&_ol]:pl-4 [&_p+p]:mt-1 [&_ul]:list-disc [&_ul]:pl-4"
+ class="select-text leading-relaxed text-ink-muted [&_a]:underline [&_ol]:list-decimal [&_ol]:pl-4 [&_p+p]:mt-1 [&_ul]:list-disc [&_ul]:pl-4"
innerHTML={html()}
onClick={openDescriptionLink}
/>
diff --git a/apps/web/src/features/email-message/components/calendar-invite-card.tsx b/apps/web/src/features/email-message/components/calendar-invite-card.tsx
index 019091fd0b..b233072c5f 100644
--- a/apps/web/src/features/email-message/components/calendar-invite-card.tsx
+++ b/apps/web/src/features/email-message/components/calendar-invite-card.tsx
@@ -300,7 +300,7 @@ export function CalendarInviteCard(props: {
<Show when={!cancelled() && invite().description}>
<div class="flex flex-col items-start gap-1.5">
<div
- class="break-words text-ink-muted [overflow-wrap:anywhere] [&_a]:text-accent [&_a]:underline [&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6"
+ class="break-words text-ink-muted [overflow-wrap:anywhere] [&_a]:underline [&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6"
classList={{ 'line-clamp-2': !descriptionExpanded() }}
innerHTML={descriptionHtml()}
onClick={openDescriptionLink}
diff --git a/apps/web/src/features/entity/components/ProjectBreadCrumb.tsx b/apps/web/src/features/entity/components/ProjectBreadCrumb.tsx
index ae3a0a2912..d30525eaf0 100644
--- a/apps/web/src/features/entity/components/ProjectBreadCrumb.tsx
+++ b/apps/web/src/features/entity/components/ProjectBreadCrumb.tsx
@@ -47,7 +47,7 @@ export function ProjectBreadCrumb(props: {
variant: 'ghost',
size: 'xs',
class: cn(
- 'min-w-0 max-w-full gap-1 border-0 font-normal text-link not-data-disabled:hover:text-link-hover not-data-disabled:active:text-link-hover popup-open:text-link-hover',
+ 'min-w-0 max-w-full gap-1 border-0 font-normal',
props.collapsed ? 'size-6 p-0 touch:size-9' : 'h-auto px-2 py-0.5'
),
})}
@@ -56,7 +56,7 @@ export function ProjectBreadCrumb(props: {
content={
<div class="min-w-48 max-w-72">
<div class="mb-1.5 flex items-center gap-2 border-b border-edge pb-1.5 text-ink-muted">
- <FolderIcon class="size-3.5 shrink-0 text-link" />
+ <FolderIcon class="size-3.5 shrink-0" />
<span class="text-xs">{t('create.folderLabel')}</span>
</div>
<div class="px-2 py-0.5 text-xs leading-5 text-ink-muted wrap-anywhere">
diff --git a/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx b/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx
index 05559c0123..36adc7667a 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx
@@ -12,7 +12,7 @@ const handler = createToolRenderer({
href={ctx.tool.data.input}
target="_blank"
rel="noopener noreferrer"
- class="italic text-link hover:text-link-hover visited:text-link-visited hover:underline"
+ class="italic text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2 hover:decoration-current"
>
{ctx.tool.data.input}
</a>
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index 6f052670bb..9541e6f3ab 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -468,7 +468,7 @@ function CalendarEventPreviewDetails(props: {
<div class="mt-2 flex items-start text-[0.8em] text-ink-muted">
<TextAlignLeftIcon class="relative mx-1 mt-0.5 size-3 shrink-0" />
<div
- class="line-clamp-4 min-w-0 wrap-anywhere [&_a]:text-accent [&_a]:underline [&_ol]:list-decimal [&_ol]:pl-4 [&_p+p]:mt-1 [&_ul]:list-disc [&_ul]:pl-4"
+ class="line-clamp-4 min-w-0 wrap-anywhere [&_a]:underline [&_ol]:list-decimal [&_ol]:pl-4 [&_p+p]:mt-1 [&_ul]:list-disc [&_ul]:pl-4"
innerHTML={html()}
onClick={openDescriptionLink}
/>
diff --git a/apps/web/src/lib/core/component/ItemPreview.tsx b/apps/web/src/lib/core/component/ItemPreview.tsx
index 955427c3e8..af31266053 100644
--- a/apps/web/src/lib/core/component/ItemPreview.tsx
+++ b/apps/web/src/lib/core/component/ItemPreview.tsx
@@ -383,7 +383,7 @@ export function InlineItemPreview(props: ItemEntity) {
<span class="relative top-[0.125em] inline-flex size-[1em] shrink-0">
<ItemEntityIcon size="fill" />
</span>
- <span class="min-w-0 truncate underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="min-w-0 truncate text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{truncateString(name(), 80)}
</span>
</span>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
index b7164d3116..ebcb7f8d10 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
@@ -7,7 +7,7 @@ export function AgentSessionMentionLabel(props: { label: string }) {
<span class="relative top-[0.125em] size-[1em] inline-flex mx-1">
<AgentIcon class="size-full text-chat" />
</span>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{props.label}
</span>
</span>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/BookingLinkMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/BookingLinkMention.tsx
index baa3ea8883..915e601246 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/BookingLinkMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/BookingLinkMention.tsx
@@ -55,7 +55,7 @@ function BookingLinkPreviewCard(props: {
href={props.url}
target="_blank"
rel="noreferrer"
- class="shrink-0 text-link hover:text-link-hover visited:text-link-visited"
+ class="shrink-0 text-ink-muted hover:text-ink"
onClick={(e) => e.stopPropagation()}
>
<OpenIcon class="size-4" />
@@ -107,7 +107,7 @@ function BookingLinkMentionContent(props: BookingLinkMentionDecoratorProps) {
<span class="relative top-[0.125em] size-[1em] shrink-0 inline-flex mx-1">
<BookingLinkIcon />
</span>
- <span class="flex min-w-0 items-baseline underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="flex min-w-0 items-baseline text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
<span class="min-w-0 truncate">{label()}</span>
<Show when={props.slug && label() !== props.slug}>
<span class="shrink-0 whitespace-pre text-ink-extra-muted text-[0.8em]">
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
index 8520685702..277ee6b4db 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
@@ -119,7 +119,7 @@ function MentionContainer(props: {
{props.icon}
</span>
<Show when={!props.collapsed}>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-[0.125em]">
+ <span class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-[0.125em]">
{props.text}
</span>
</Show>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PullRequestMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PullRequestMention.tsx
index be118ec390..b696a9a341 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PullRequestMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PullRequestMention.tsx
@@ -326,7 +326,7 @@ function PullRequestPreviewBody(props: { id: string; fallbackLabel?: string }) {
href={url()}
target="_blank"
rel="noreferrer"
- class="shrink-0 text-link hover:text-link-hover visited:text-link-visited"
+ class="shrink-0 text-ink-muted hover:text-ink"
onClick={(e) => e.stopPropagation()}
>
<OpenIcon class="size-4" />
@@ -463,7 +463,7 @@ function UnsyncedPullRequestPreviewCard(props: {
href={url()}
target="_blank"
rel="noreferrer"
- class="shrink-0 text-link hover:text-link-hover visited:text-link-visited"
+ class="shrink-0 text-ink-muted hover:text-ink"
onClick={(e) => e.stopPropagation()}
>
<OpenIcon class="size-4" />
@@ -544,7 +544,7 @@ function PullRequestMentionContent(props: PullRequestMentionDecoratorProps) {
<span class="relative top-[0.125em] size-[1em] shrink-0 inline-flex mx-1">
<PullRequestStatusIcon status={status()} />
</span>
- <span class="flex min-w-0 items-baseline underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="flex min-w-0 items-baseline text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
<span class="min-w-0 truncate">{parts().name}</span>
<Show when={parts().number}>
{(number) => (
@@ -642,7 +642,7 @@ export function PullRequestMention(props: PullRequestMentionDecoratorProps) {
href={props.url}
target="_blank"
rel="noreferrer"
- class="text-link hover:text-link-hover visited:text-link-visited underline"
+ class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2 hover:decoration-current"
>
{fallbackLabel(mentionFallbackLabel(props))}
</a>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/Snapshot.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/Snapshot.tsx
index 95961a5dba..f84fb67860 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/Snapshot.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/Snapshot.tsx
@@ -34,7 +34,7 @@ function MentionContainer(props: { icon: JSX.Element; text: JSX.Element }) {
<span class="relative top-[0.125em] size-[1em] inline-flex mx-1">
{props.icon}
</span>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{props.text}
</span>
</span>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/TagMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/TagMention.tsx
index 91cf4951fc..a6475b36bb 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/TagMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/TagMention.tsx
@@ -137,7 +137,7 @@ export function TagMention(props: TagMentionDecoratorProps) {
<span class="relative inline-flex -top-px mr-1">
<TagDot color={resolvedTag().color} class="size-[0.5em]" />
</span>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{resolvedTag().name}
</span>
</span>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ThemeMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ThemeMention.tsx
index 2e293f7d0a..2dc7d5685e 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ThemeMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ThemeMention.tsx
@@ -56,7 +56,7 @@ export function ThemeMention(props: ThemeMentionDecoratorProps) {
</span>
)}
</Show>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
+ <span class="text-ink underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
{props.name}
</span>
</span>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts b/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
index c1ee25adb3..abc71d98ce 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
@@ -68,7 +68,9 @@ export const theme: EditorThemeClasses = {
checklist: 'md-list md-check',
listitemChecked: 'checked md-strike text-ink-extra-muted',
},
- link: 'text-link hover:text-link-hover visited:text-link-visited underline hover:underline cursor-default underline-offset-[0.15em]',
+ // Same color as the surrounding text. Accent is blue in the default themes,
+ // and painting links with it made them blue in some surfaces only.
+ link: 'underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-[0.15em] hover:decoration-current cursor-default',
quote:
'md-quote border-l-2 border-edge pl-4 py-2 italic text-ink-muted my-4 first:mt-1.5',
code: 'bg-code-buffer font-mono p-3 rounded block md-code-box before:text-ink-extra-muted/70 whitespace-pre mb-4',
@@ -188,7 +190,6 @@ export const channelThemeSender = createTheme(
list: {
listitemChecked: 'checked chat-blue md-strike text-current/50',
},
- link: 'text-link hover:text-link-hover visited:text-link-visited underline',
code: `chat-blue font-mono p-3 rounded block md-code-box before:text-current/50`,
static: {
'code-container': `bg-[navy]/20 rounded m-2`,