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(themes): refine default light dark themes (#4674)

Peter Chinman8b3fa27f8f2d
diff --git a/js/app/packages/app/component/next-soup/soup-view/views/companies/company-grid-layout.tsx b/js/app/packages/app/component/next-soup/soup-view/views/companies/company-grid-layout.tsx
index 61fadd0aba..244ad4e7e6 100644
--- a/js/app/packages/app/component/next-soup/soup-view/views/companies/company-grid-layout.tsx
+++ b/js/app/packages/app/component/next-soup/soup-view/views/companies/company-grid-layout.tsx
@@ -173,7 +173,7 @@ export function CompanyGridLayout(props: LayoutProps) {
<Entity.Slot
placement="content"
- class="ph-no-capture font-semibold truncate items-center gap-2 flex min-w-0"
+ class="ph-no-capture font-medium truncate items-center gap-2 flex min-w-0"
>
<div class="size-4 shrink-0">
<Entity.Icon
diff --git a/js/app/packages/app/component/next-soup/soup-view/views/tasks/task-grid-layout.tsx b/js/app/packages/app/component/next-soup/soup-view/views/tasks/task-grid-layout.tsx
index 4f772dd40b..6a15008282 100644
--- a/js/app/packages/app/component/next-soup/soup-view/views/tasks/task-grid-layout.tsx
+++ b/js/app/packages/app/component/next-soup/soup-view/views/tasks/task-grid-layout.tsx
@@ -157,7 +157,7 @@ export function TaskGridLayout(props: LayoutProps) {
<Entity.Slot
placement="content"
- class="ph-no-capture font-semibold truncate items-center gap-2 flex min-w-0"
+ class="ph-no-capture font-medium truncate items-center gap-2 flex min-w-0"
>
<div class="size-4 shrink-0">
<Entity.Icon
diff --git a/js/app/packages/channel/Attachments/AttachmentEntityRow.tsx b/js/app/packages/channel/Attachments/AttachmentEntityRow.tsx
index c27d986b36..f2987ac464 100644
--- a/js/app/packages/channel/Attachments/AttachmentEntityRow.tsx
+++ b/js/app/packages/channel/Attachments/AttachmentEntityRow.tsx
@@ -18,7 +18,7 @@ export function AttachmentEntityRow(props: {
<div class="size-4 shrink-0">
<Entity.Icon entity={props.entity} />
</div>
- <span class="ph-no-capture font-semibold truncate flex-1 min-w-0">
+ <span class="ph-no-capture font-medium truncate flex-1 min-w-0">
<Entity.Title entity={props.entity} />
</span>
<Show when={props.senderId}>
diff --git a/js/app/packages/entity/src/composed/list-entity/channel.tsx b/js/app/packages/entity/src/composed/list-entity/channel.tsx
index 5444c2b1f4..f5304f43ea 100644
--- a/js/app/packages/entity/src/composed/list-entity/channel.tsx
+++ b/js/app/packages/entity/src/composed/list-entity/channel.tsx
@@ -18,7 +18,7 @@ function ChannelMessage(props: {
const hasContent = () => Boolean(props.message.content?.trim());
return (
<>
- <span class="ph-no-capture font-semibold truncate min-w-min max-w-1/3 shrink-0">
+ <span class="ph-no-capture font-medium truncate min-w-min max-w-1/3 shrink-0">
<DisplayName id={props.message.senderId} format="firstName" />
</span>
<span class="ph-no-capture text-ink/50 font-medium truncate inline-flex items-center shrink min-w-0">
diff --git a/js/app/packages/entity/src/composed/list-entity/wide-layout.tsx b/js/app/packages/entity/src/composed/list-entity/wide-layout.tsx
index 9a42c7c66d..b2d2b55c61 100644
--- a/js/app/packages/entity/src/composed/list-entity/wide-layout.tsx
+++ b/js/app/packages/entity/src/composed/list-entity/wide-layout.tsx
@@ -100,7 +100,7 @@ export function WideLayout(props: LayoutProps) {
</Show>
<Entity.Slot
placement="content"
- class="ph-no-capture font-semibold truncate items-center gap-2 flex"
+ class="ph-no-capture font-medium truncate items-center gap-2 flex"
>
<div class="size-4 shrink-0">
<Entity.Icon entity={props.entity} streamState={props.streamState} />
diff --git a/js/app/packages/theme/constants.ts b/js/app/packages/theme/constants.ts
index db1b3cbd58..43498ae27e 100644
--- a/js/app/packages/theme/constants.ts
+++ b/js/app/packages/theme/constants.ts
@@ -25,18 +25,18 @@ const MACRO_DARK: Pick<ThemeV2, 'depth' | 'tokens' | 'overrides'> = isMobile()
},
}
: {
- depth: 0.15,
+ depth: 0.20,
tokens: {
a0: { l: 0.75, c: 0.20, h: 59 },
a1: { l: 0.75, c: 0.20, h: 99 },
a2: { l: 0.75, c: 0.20, h: 139 },
a3: { l: 0.75, c: 0.20, h: 179 },
a4: { l: 0.75, c: 0.20, h: 219 },
- b0: { l: 0.14, c: 0.00, h: 59 },
+ b0: { l: 0.13, c: 0.00, h: 59 },
b1: { l: 0.20, c: 0.00, h: 59 },
b2: { l: 0.23, c: 0.00, h: 59 },
- b3: { l: 0.25, c: 0.00, h: 59 },
- b4: { l: 0.28, c: 0.00, h: 59 },
+ b3: { l: 0.22, c: 0.00, h: 59 },
+ b4: { l: 0.22, c: 0.00, h: 59 },
c0: { l: 0.95, c: 0.00, h: 59 },
c1: { l: 0.83, c: 0.00, h: 59 },
c2: { l: 0.75, c: 0.00, h: 59 },
@@ -85,23 +85,23 @@ const MACRO_LIGHT: Pick<ThemeV2, 'depth' | 'tokens' | 'overrides'> = isMobile()
]
}
: {
- depth: 0.09,
+ depth: 0.16,
tokens: {
a0: { l: 0.65, c: 0.20, h: 59 },
a1: { l: 0.65, c: 0.20, h: 99 },
a2: { l: 0.65, c: 0.20, h: 139 },
a3: { l: 0.65, c: 0.20, h: 179 },
a4: { l: 0.65, c: 0.20, h: 219 },
- b0: { l: 0.96, c: 0.00, h: 59 },
+ b0: { l: 0.964, c: 0.00, h: 59 },
b1: { l: 0.92, c: 0.00, h: 59 },
b2: { l: 0.91, c: 0.00, h: 59 },
b3: { l: 0.92, c: 0.00, h: 59 },
b4: { l: 0.91, c: 0.00, h: 59 },
- c0: { l: 0.14, c: 0.00, h: 59 },
+ c0: { l: 0.16, c: 0.00, h: 59 },
c1: { l: 0.40, c: 0.00, h: 59 },
- c2: { l: 0.55, c: 0.00, h: 59 },
- c3: { l: 0.65, c: 0.00, h: 59 },
- c4: { l: 0.75, c: 0.00, h: 59 },
+ c2: { l: 0.45, c: 0.00, h: 59 },
+ c3: { l: 0.55, c: 0.00, h: 59 },
+ c4: { l: 0.70, c: 0.00, h: 59 },
},
};
diff --git a/js/app/packages/ui/components/Layer.tsx b/js/app/packages/ui/components/Layer.tsx
index a5da02a8ab..9031a37ea5 100644
--- a/js/app/packages/ui/components/Layer.tsx
+++ b/js/app/packages/ui/components/Layer.tsx
@@ -18,8 +18,9 @@ export function Layer(props: LayerProps) {
// As Layer depth increases, Borders should get lighter slower than surfaces. So we multiple them by this.
const BORDER_SCALAR = 0.4;
- // If --b0 is black, or near black, we need to set a min step to get appropriate contrast
- const nearBlackStepMin = () => ((props.depth ?? 0) > 0 ? 0.19 : 0);
+ // For pure black mobile theme, we need to set a min step to get appropriate contrast
+ const nearBlackStepMin = () =>
+ (props.depth ?? 0) > 0 && isMobile() ? 0.19 : 0;
return (
<div