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(task): fix inline task pills styling (#6094)

Seamus12284a7f7a28
diff --git a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
index cfc9994f84..24db73709d 100644
--- a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
+++ b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
@@ -3,13 +3,13 @@ import { Property } from '@property';
import { usePropertiesContext } from '@property/context/PropertiesContext';
import type { Property as PropertyT } from '@property/types';
import { getEntityValues } from '@property/utils';
-import { Layer } from '@ui';
import { type Component, type JSX, Match, Switch } from 'solid-js';
type InlinePropertyValueProps = {
property: PropertyT;
/** Label rendered when the property is empty. Defaults to "None". */
emptyLabel?: JSX.Element;
+ class?: string;
};
/**
@@ -39,34 +39,32 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (
onRefresh={ctx.onRefresh}
>
<Property.Tooltip property={props.property}>
- <Layer depth={2}>
- <Property.Pill>
- <Switch
- fallback={
- <Property.Icon
- property={props.property}
- class="size-3 shrink-0"
- />
- }
- >
- <Match when={isMultiUserEntity()}>
- <Property.UserStack property={props.property} maxUsers={2} />
- </Match>
- <Match when={isUserEntity()}>
- <Property.Icon property={props.property} />
- </Match>
- </Switch>
- <Property.Text
- property={props.property}
- fallback={
- <Property.Empty
- label={props.emptyLabel ?? props.property.displayName}
- />
- }
- />
- <Property.Caret />
- </Property.Pill>
- </Layer>
+ <Property.Pill class={props.class} variant="outline">
+ <Switch
+ fallback={
+ <Property.Icon
+ property={props.property}
+ class="size-3 shrink-0"
+ />
+ }
+ >
+ <Match when={isMultiUserEntity()}>
+ <Property.UserStack property={props.property} maxUsers={2} />
+ </Match>
+ <Match when={isUserEntity()}>
+ <Property.Icon property={props.property} />
+ </Match>
+ </Switch>
+ <Property.Text
+ property={props.property}
+ fallback={
+ <Property.Empty
+ label={props.emptyLabel ?? props.property.displayName}
+ />
+ }
+ />
+ <Property.Caret />
+ </Property.Pill>
</Property.Tooltip>
<Property.PopoverEditor
entitySelfFilter={{ entityType: ctx.entityType, blockId }}
diff --git a/apps/web/src/features/block-md/component/InlineTaskProperties.tsx b/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
index 2b41037633..93bdabe15f 100644
--- a/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
+++ b/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
@@ -88,11 +88,17 @@ export function InlineTaskProperties() {
saveHandler={saveHandler}
>
<For each={inlineProperties()}>
- {(property) => <InlinePropertyValue property={property} />}
+ {(property) => (
+ <InlinePropertyValue
+ property={property}
+ class="bg-surface-2 border border-edge"
+ />
+ )}
</For>
<InlineFetchedEntityTagsPill
entityId={blockId}
entityType={entityType}
+ class="bg-surface-2"
/>
<Show when={blockName === 'task' && md.progressStats}>
{(progressStats) => (
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/status/Progress.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/status/Progress.tsx
index 451d876882..ad0f160ad4 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/status/Progress.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/status/Progress.tsx
@@ -58,7 +58,7 @@ export function ProgressChip(props: ProgressProps) {
<Tooltip label={progress.tooltip()} as="span">
<div
class={cn(
- 'inline-flex min-w-0 items-center gap-1.5 rounded-full border border-edge-muted',
+ 'h-6 inline-flex min-w-0 items-center gap-1.5 rounded-full border border-edge-muted',
'bg-surface px-2 py-1 leading-tight',
props.class
)}