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.

Match list backgrounds, rounding, and spacing to sidebar and CRM (#6563)

Jacob Beckerman22dce4d20621
diff --git a/apps/web/src/components/view-shell/ViewShell.tsx b/apps/web/src/components/view-shell/ViewShell.tsx
index c4639775b3..66007e4909 100644
--- a/apps/web/src/components/view-shell/ViewShell.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.tsx
@@ -641,10 +641,7 @@ function Content(props: JSX.HTMLAttributes<HTMLDivElement>) {
<Show when={ws.detail.placement() !== 'replace'}>
<div
{...rest}
- class={cn(
- 'min-h-0 min-w-0 flex-1 px-4 pb-4 @max-[760px]/view-shell:px-3 @max-[720px]/view-shell:pb-2 @max-[480px]/view-shell:px-2',
- local.class
- )}
+ class={cn('min-h-0 min-w-0 flex-1', local.class)}
data-view-shell-content=""
>
{local.children}
diff --git a/apps/web/src/features/entity/composed/ListEntity.tsx b/apps/web/src/features/entity/composed/ListEntity.tsx
index 81cb3244c2..f457400fe0 100644
--- a/apps/web/src/features/entity/composed/ListEntity.tsx
+++ b/apps/web/src/features/entity/composed/ListEntity.tsx
@@ -198,7 +198,7 @@ export function ListEntity(props: ListEntityProps) {
// that the layouts below and the soup group headers both read, so it has
// to track which layout the Switch actually renders.
isWide() ? SOUP_ROW_CLASS.wide : SOUP_ROW_CLASS.narrow,
- 'soup-list-entity rounded-lg @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5',
+ 'soup-list-entity rounded-xl @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5',
{
'min-h-10 mx-(--soup-row-gutter)':
!isMobile() && !usesCondensedNarrowLayout(),
diff --git a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyListEntity.tsx b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyListEntity.tsx
index b11ce317d3..f3f8b83bed 100644
--- a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyListEntity.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyListEntity.tsx
@@ -87,7 +87,7 @@ export function CompanyListEntity(props: BaseListEntityProps) {
// Carries the --soup-row-* geometry (ListEntity.css) that the narrow
// layout below reads for its leading edge.
isWide() ? SOUP_ROW_CLASS.wide : SOUP_ROW_CLASS.narrow,
- 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-lg',
+ 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-xl',
{
'min-h-10 mx-(--soup-row-gutter)': !isMobile(),
'bg-list-selected': props.checked,
diff --git a/apps/web/src/features/next-soup/soup-view/views/inbox/InboxCard.tsx b/apps/web/src/features/next-soup/soup-view/views/inbox/InboxCard.tsx
index 686ccdf864..f3f6f4dd8b 100644
--- a/apps/web/src/features/next-soup/soup-view/views/inbox/InboxCard.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/inbox/InboxCard.tsx
@@ -45,7 +45,7 @@ function Root(props: RootProps): JSX.Element {
// appears on hover. It comes from the --soup-row-* geometry in
// ListEntity.css — which also carries the mobile rail value — so group
// headers can line their label up with this card's content.
- 'group/inbox-item relative min-h-16 grid w-full grid-cols-[2rem_minmax(0,1fr)_max-content] grid-rows-[min-content_min-content] items-start gap-x-3 rounded-lg py-2.5 pr-2 pl-(--soup-row-padding-l)',
+ 'group/inbox-item relative min-h-16 grid w-full grid-cols-[2rem_minmax(0,1fr)_max-content] grid-rows-[min-content_min-content] items-start gap-x-3 rounded-xl py-2.5 pr-2 pl-(--soup-row-padding-l)',
// Mobile renders the same cards in slightly different visual
// language: a full-bleed row whose left rail holds the unread dot
// (see the span below) instead of the checkbox gutter, with the
diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListEntity.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListEntity.tsx
index 07b226a97d..1bc0f3d310 100644
--- a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListEntity.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListEntity.tsx
@@ -154,7 +154,7 @@ export function TaskListEntity(props: TaskListEntityProps) {
// Carries the --soup-row-* geometry (ListEntity.css) that the narrow
// layout below reads for its leading edge.
isWide() ? SOUP_ROW_CLASS.wide : SOUP_ROW_CLASS.narrow,
- 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-lg',
+ 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-xl',
{
'min-h-10 mx-(--soup-row-gutter)': !isMobile(),
'bg-list-selected': props.checked,
diff --git a/apps/web/src/features/tasks-view/components/task-list/TaskListEntity.tsx b/apps/web/src/features/tasks-view/components/task-list/TaskListEntity.tsx
index 3a16717e61..8179e02b93 100644
--- a/apps/web/src/features/tasks-view/components/task-list/TaskListEntity.tsx
+++ b/apps/web/src/features/tasks-view/components/task-list/TaskListEntity.tsx
@@ -151,7 +151,7 @@ export function TaskListEntity(props: TaskListEntityProps) {
}}
ref={mergeRefs(props.ref, draggable)}
class={cn(
- 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-lg',
+ 'soup-list-entity @container/entity w-[calc(100%-0.5rem)] mr-1 relative group/narrow flex flex-col py-0.5 rounded-xl',
{
'min-h-10 mx-1': !isMobile(),
'bg-list-selected': props.checked,
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index b37554252a..25a9c458bd 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -406,8 +406,8 @@ body.tauri-ios {
default covers first paint, before the mode attribute is written. */
--color-avatar-edge: oklch(0 0 0 / 0.4);
--color-skeleton: color-mix(in oklch, var(--color-ink) 10%, transparent);
- --color-list-hover: color-mix(in oklch, var(--color-ink) 6%, transparent);
- --color-list-highlighted: color-mix(in oklch, var(--color-ink) 8%, transparent);
+ --color-list-hover: var(--color-hover);
+ --color-list-highlighted: var(--color-hover);
--color-list-selected: var(--color-selected);
--color-list-selected-highlighted: color-mix(in oklch, var(--color-accent) 16%, transparent);