Skip to content

The open alternative to Salesforce, designed for AI.

Update website app mockup to the current product design (#26313)

Thomas des Francs5a1c8bcd884f
diff --git a/packages/twenty-website/src/app-preview/app-preview-chrome.ts b/packages/twenty-website/src/app-preview/app-preview-chrome.ts
index e6e5a014002..d66c4d0aee9 100644
--- a/packages/twenty-website/src/app-preview/app-preview-chrome.ts
+++ b/packages/twenty-website/src/app-preview/app-preview-chrome.ts
@@ -2,11 +2,14 @@ import { THEME_COMMON } from 'twenty-ui/theme';
// Product layout facts the mockup mirrors that aren't part of twenty-ui's
// theme. The spacing base and nav-item height derive from twenty-ui's spacing
-// unit; the drawer width and record-table row height are twenty-front layout
-// constants (NavigationDrawerConstraints / RecordTableRowHeight).
+// unit; the header height, drawer width and record-table row height are
+// twenty-front layout constants (AppHeaderHeight / NavigationDrawerConstraints
+// / RecordTableRowHeight).
export const APP_PREVIEW_CHROME = {
spacingBasePx: THEME_COMMON.spacingMultiplicator,
+ appHeaderHeightPx: 48,
navigationItemHeightPx: THEME_COMMON.spacingMultiplicator * 7,
navigationDrawerWidthPx: 220,
+ navigationDrawerPaddingPx: THEME_COMMON.spacingMultiplicator * 2,
recordTableRowHeightPx: 32,
};
diff --git a/packages/twenty-website/src/app-preview/data/dashboards-table-page.ts b/packages/twenty-website/src/app-preview/data/dashboards-table-page.ts
index fb88f361a10..8facd4360dd 100644
--- a/packages/twenty-website/src/app-preview/data/dashboards-table-page.ts
+++ b/packages/twenty-website/src/app-preview/data/dashboards-table-page.ts
@@ -11,9 +11,15 @@ export const DASHBOARDS_TABLE_PAGE: TablePageDefinition = {
count: 2,
},
columns: [
- { id: 'name', label: 'Name', width: 240, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 240,
+ icon: 'layoutDashboard',
+ isFirstColumn: true,
+ },
{ id: 'createdBy', label: 'Created By', width: 160 },
- { id: 'added', label: 'Last Edited', width: 160 },
+ { id: 'added', label: 'Last Edited', width: 160, icon: 'lastEdited' },
],
rows: [
{
diff --git a/packages/twenty-website/src/app-preview/data/people-table-page.ts b/packages/twenty-website/src/app-preview/data/people-table-page.ts
index 1e688f95624..8d97f3801b8 100644
--- a/packages/twenty-website/src/app-preview/data/people-table-page.ts
+++ b/packages/twenty-website/src/app-preview/data/people-table-page.ts
@@ -11,7 +11,13 @@ export const PEOPLE_TABLE_PAGE: TablePageDefinition = {
count: 5,
},
columns: [
- { id: 'name', label: 'Name', width: 180, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 180,
+ icon: 'user',
+ isFirstColumn: true,
+ },
{ id: 'company', label: 'Company', width: 160 },
{ id: 'email', label: 'Email', width: 200 },
{ id: 'phone', label: 'Phone', width: 160 },
diff --git a/packages/twenty-website/src/app-preview/data/rocket-objects.ts b/packages/twenty-website/src/app-preview/data/rocket-objects.ts
index c18bce07186..e6710fba0d0 100644
--- a/packages/twenty-website/src/app-preview/data/rocket-objects.ts
+++ b/packages/twenty-website/src/app-preview/data/rocket-objects.ts
@@ -10,7 +10,13 @@ const ROCKET_PAGE: TablePageDefinition = {
count: 6,
},
columns: [
- { id: 'name', label: 'Name', width: 200, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 200,
+ icon: 'rocket',
+ isFirstColumn: true,
+ },
{ id: 'serialNumber', label: 'Serial Number', width: 130 },
{ id: 'manufacturer', label: 'Manufacturer', width: 180 },
{ id: 'status', label: 'Status', width: 130 },
@@ -158,7 +164,13 @@ const LAUNCH_PAGE: TablePageDefinition = {
type: 'table',
header: { title: 'Launches', count: 5 },
columns: [
- { id: 'name', label: 'Name', width: 200, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 200,
+ icon: 'calendarEvent',
+ isFirstColumn: true,
+ },
{ id: 'missionCode', label: 'Mission Code', width: 140 },
{ id: 'status', label: 'Status', width: 130 },
{ id: 'missionType', label: 'Mission Type', width: 140 },
@@ -285,7 +297,13 @@ const PAYLOAD_PAGE: TablePageDefinition = {
type: 'table',
header: { title: 'Payloads', count: 5 },
columns: [
- { id: 'name', label: 'Name', width: 200, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 200,
+ icon: 'planet',
+ isFirstColumn: true,
+ },
{ id: 'payloadType', label: 'Payload Type', width: 150 },
{ id: 'status', label: 'Status', width: 130 },
{ id: 'customer', label: 'Customer', width: 170 },
@@ -416,7 +434,13 @@ const LAUNCH_SITE_PAGE: TablePageDefinition = {
type: 'table',
header: { title: 'Launch sites', count: 5 },
columns: [
- { id: 'name', label: 'Name', width: 220, isFirstColumn: true },
+ {
+ id: 'name',
+ label: 'Name',
+ width: 220,
+ icon: 'mapPin',
+ isFirstColumn: true,
+ },
{ id: 'siteCode', label: 'Site Code', width: 140 },
{ id: 'padName', label: 'Pad Name', width: 180 },
{ id: 'country', label: 'Country', width: 140 },
diff --git a/packages/twenty-website/src/app-preview/data/workflows-folder.ts b/packages/twenty-website/src/app-preview/data/workflows-folder.ts
index 34ba9855fb2..169390f4afd 100644
--- a/packages/twenty-website/src/app-preview/data/workflows-folder.ts
+++ b/packages/twenty-website/src/app-preview/data/workflows-folder.ts
@@ -16,7 +16,7 @@ const NAMED_WORKFLOW_NAVBAR_ACTIONS = [
{ icon: 'playerPause', label: 'Deactivate' },
{ icon: 'repeat', label: 'See Runs' },
{ icon: 'plus', label: 'Add a Node' },
- { icon: 'dotsVertical', trailingLabel: '\u2318K' },
+ { icon: 'dotsVertical', variant: 'icon' },
] satisfies NavbarAction[];
const PEOPLE_AVATAR_URLS = sharedAssetUrls.peopleAvatars;
@@ -32,6 +32,7 @@ const WORKFLOW_LIST_TABLE: TablePageDefinition = {
id: 'name',
label: 'Name',
width: 240,
+ icon: 'settingsAutomation',
isFirstColumn: true,
},
{ id: 'status', label: 'Status', width: 140 },
@@ -74,7 +75,7 @@ const WORKFLOW_LIST_TABLE: TablePageDefinition = {
const WORKFLOW_RUNS_TABLE: TablePageDefinition = {
type: 'table',
header: {
- title: 'All Runs',
+ title: 'All Workflow Runs',
count: 2,
},
columns: [
@@ -136,7 +137,7 @@ const WORKFLOW_RUNS_TABLE: TablePageDefinition = {
const WORKFLOW_VERSIONS_TABLE: TablePageDefinition = {
type: 'table',
header: {
- title: 'All Versions',
+ title: 'All Workflow Versions',
count: 2,
},
columns: [
@@ -252,13 +253,13 @@ export const WORKFLOWS_FOLDER: SidebarFolderDef = {
},
{
id: 'workflow-runs',
- label: 'Workflows runs',
+ label: 'Workflow Runs',
icon: { kind: 'tabler', name: 'playerPlay', tone: 'gray' },
page: WORKFLOW_RUNS_TABLE,
},
{
id: 'workflow-versions',
- label: 'Workflows versions',
+ label: 'Workflow Versions',
icon: { kind: 'tabler', name: 'versions', tone: 'gray' },
page: WORKFLOW_VERSIONS_TABLE,
},
diff --git a/packages/twenty-website/src/app-preview/pages/table/TableCheckbox.tsx b/packages/twenty-website/src/app-preview/pages/table/TableCheckbox.tsx
index 2f5c6b5eee6..9a1689a1c60 100644
--- a/packages/twenty-website/src/app-preview/pages/table/TableCheckbox.tsx
+++ b/packages/twenty-website/src/app-preview/pages/table/TableCheckbox.tsx
@@ -20,7 +20,7 @@ const CheckboxBox = styled.div<{ $checked?: boolean }>`
$checked
? THEME_LIGHT.border.color.blue
: THEME_LIGHT.font.color.primary};
- border-radius: 3px;
+ border-radius: ${THEME_LIGHT.border.radius.smRound};
display: flex;
flex: 0 0 auto;
height: 14px;
diff --git a/packages/twenty-website/src/app-preview/pages/table/TableHeaderIcon.tsx b/packages/twenty-website/src/app-preview/pages/table/TableHeaderIcon.tsx
index dbe4b5ef36c..79345d53d99 100644
--- a/packages/twenty-website/src/app-preview/pages/table/TableHeaderIcon.tsx
+++ b/packages/twenty-website/src/app-preview/pages/table/TableHeaderIcon.tsx
@@ -1,44 +1,122 @@
import {
+ Icon123,
+ IconArrowUpRight,
IconBrandLinkedin,
+ IconBriefcase,
IconBuildingFactory2,
+ IconBuildingSkyscraper,
+ IconCalendar,
+ IconCalendarClock,
IconCalendarEvent,
+ IconCategory,
+ IconClock,
IconCreativeCommonsSa,
+ IconFlag,
+ IconHistory,
+ IconLayoutDashboard,
IconLink,
- IconMap2,
+ IconMail,
+ IconMap,
+ IconMapPin,
IconMoneybag,
+ IconNotes,
+ IconPhone,
+ IconPlanet,
+ IconRepeat,
+ IconRocket,
+ IconRuler,
+ IconSettingsAutomation,
+ IconStatusChange,
+ IconTag,
IconTarget,
IconTargetArrow,
IconUser,
IconUserCircle,
IconUsers,
+ IconVersions,
+ IconWeight,
} from '@tabler/icons-react';
import { type ReactNode } from 'react';
import { THEME_LIGHT } from 'twenty-ui/theme';
-const HEADER_ICON_MAP: Record<string, typeof IconCalendarEvent> = {
- added: IconCalendarEvent,
+import { type ColumnDef } from '../../types';
+
+// Column headers carry their field's icon. Standard CRM fields are pinned to
+// twenty-server's field metadata; the rocket scenario's invented fields take
+// the nearest product icon. A column whose field name is shared across
+// objects — every object's label identifier is `name` — names its own icon.
+const HEADER_ICON_MAP: Record<string, typeof IconCalendar> = {
accountOwner: IconUserCircle,
- address: IconMap2,
+ actualLaunchAt: IconCalendarEvent,
+ added: IconCalendar,
+ address: IconMap,
arr: IconMoneybag,
+ assignee: IconUserCircle,
+ calendarEvent: IconCalendarEvent,
+ city: IconMapPin,
+ company: IconBuildingSkyscraper,
+ country: IconFlag,
createdBy: IconCreativeCommonsSa,
+ customer: IconBuildingSkyscraper,
+ dueDate: IconCalendarEvent,
+ duration: IconClock,
+ email: IconMail,
employees: IconUsers,
+ heightMeters: IconRuler,
icp: IconTarget,
industry: IconBuildingFactory2,
+ jobTitle: IconBriefcase,
+ lastEdited: IconCalendarClock,
+ lastRun: IconHistory,
+ launch: IconCalendarEvent,
+ launchDate: IconCalendarEvent,
+ launchSite: IconMapPin,
+ layoutDashboard: IconLayoutDashboard,
linkedin: IconBrandLinkedin,
mainContact: IconUser,
+ manufacturer: IconBuildingSkyscraper,
+ mapPin: IconMapPin,
+ massKg: IconWeight,
+ missionCode: Icon123,
+ missionType: IconCategory,
+ notes: IconNotes,
opportunities: IconTargetArrow,
+ padName: IconMapPin,
+ payloadType: IconCategory,
+ phone: IconPhone,
+ planet: IconPlanet,
+ plannedLaunchAt: IconCalendarEvent,
+ publishedAt: IconCalendar,
+ publishedBy: IconUserCircle,
+ relatedTo: IconArrowUpRight,
+ reusable: IconRepeat,
+ rocket: IconRocket,
+ runId: Icon123,
+ serialNumber: Icon123,
+ settingsAutomation: IconSettingsAutomation,
+ siteCode: Icon123,
+ siteStatus: IconStatusChange,
+ startedAt: IconHistory,
+ status: IconStatusChange,
+ targetOrbit: IconPlanet,
+ title: IconNotes,
url: IconLink,
+ user: IconUser,
+ version: IconVersions,
+ workflow: IconSettingsAutomation,
};
-export function renderTableHeaderIcon(columnId: string): ReactNode {
- const Icon = HEADER_ICON_MAP[columnId] ?? IconCalendarEvent;
+export function renderTableHeaderIcon(
+ column: Pick<ColumnDef, 'id' | 'icon'>,
+): ReactNode {
+ const Icon = HEADER_ICON_MAP[column.icon ?? column.id] ?? IconTag;
return (
<Icon
aria-hidden
color={THEME_LIGHT.font.color.tertiary}
- size={16}
- stroke={THEME_LIGHT.icon.stroke.sm}
+ size={THEME_LIGHT.icon.size.md}
+ stroke={THEME_LIGHT.icon.stroke.md}
/>
);
}
diff --git a/packages/twenty-website/src/app-preview/pages/table/TablePage.tsx b/packages/twenty-website/src/app-preview/pages/table/TablePage.tsx
index 8b1d37e12fc..85f8ddb9be9 100644
--- a/packages/twenty-website/src/app-preview/pages/table/TablePage.tsx
+++ b/packages/twenty-website/src/app-preview/pages/table/TablePage.tsx
@@ -19,6 +19,9 @@ import { useHorizontalDragScroll } from '@/platform/motion';
import { type TablePageDefinition } from '../../types';
const CELL_HORIZONTAL_PADDING = 8;
+// The product's row rule sits below the row, not inside it: the 32px row
+// height and the 1px separator stack into the table's pitch.
+const ROW_PITCH_PX = APP_PREVIEW_CHROME.recordTableRowHeightPx + 1;
const TableShell = styled.div`
display: flex;
@@ -90,7 +93,7 @@ const DataRow = styled.div<{ $rowIndex: number }>`
}
to {
opacity: 1;
- max-height: ${APP_PREVIEW_CHROME.recordTableRowHeightPx}px;
+ max-height: ${ROW_PITCH_PX}px;
}
}
`;
@@ -120,7 +123,7 @@ const TableCell = styled.div<{
box-sizing: border-box;
display: flex;
flex: 0 0 ${({ $width }) => `${$width}px`};
- height: ${APP_PREVIEW_CHROME.recordTableRowHeightPx}px;
+ height: ${ROW_PITCH_PX}px;
justify-content: ${({ $align }) =>
$align === 'right' ? 'flex-end' : 'flex-start'};
left: ${({ $sticky }) => ($sticky ? '0' : 'auto')};
@@ -264,19 +267,19 @@ export function TablePage({ page }: { page: TablePageDefinition }) {
{column.isFirstColumn ? (
<>
<TableCheckbox />
- {renderTableHeaderIcon(column.id)}
+ {renderTableHeaderIcon(column)}
<HeaderLabel>{column.label}</HeaderLabel>
<EdgePlus aria-hidden>
<MiniIcon
icon={IconPlus}
color={THEME_LIGHT.font.color.tertiary}
- size={12}
+ size={THEME_LIGHT.icon.size.sm}
/>
</EdgePlus>
</>
) : (
<>
- {renderTableHeaderIcon(column.id)}
+ {renderTableHeaderIcon(column)}
<HeaderLabel>{column.label}</HeaderLabel>
</>
)}
diff --git a/packages/twenty-website/src/app-preview/primitives/PreviewIcon.tsx b/packages/twenty-website/src/app-preview/primitives/PreviewIcon.tsx
index 17f0c1f84f6..8e7b1a75e79 100644
--- a/packages/twenty-website/src/app-preview/primitives/PreviewIcon.tsx
+++ b/packages/twenty-website/src/app-preview/primitives/PreviewIcon.tsx
@@ -50,21 +50,12 @@ const TABLER_ICON_MAP: Record<string, typeof IconBuildingSkyscraper> = {
versions: IconVersions,
};
-const SidebarIconSurface = styled.div<{
- $background: string;
- $border: string;
- $color: string;
- $pulse?: boolean;
-}>`
+const SidebarIconSlot = styled.div<{ $pulse?: boolean }>`
align-items: center;
animation: ${({ $pulse }) =>
$pulse
? `objectAppearIcon 1400ms ${APP_PREVIEW_MOTION.revealPopEase} both`
: 'none'};
- background: ${({ $background }) => $background};
- border: 1px solid ${({ $border }) => $border};
- border-radius: ${THEME_LIGHT.border.radius.sm};
- color: ${({ $color }) => $color};
display: flex;
flex: 0 0 auto;
height: 16px;
@@ -143,12 +134,7 @@ export function renderPreviewIcon(
): ReactNode {
if (icon.kind === 'brand') {
return (
- <SidebarIconSurface
- $background="transparent"
- $border="transparent"
- $color={THEME_LIGHT.font.color.secondary}
- $pulse={pulse}
- >
+ <SidebarIconSlot $pulse={pulse}>
{icon.brand === 'twenty' ? (
// The official mark is a component — never a raster copy.
<TwentyLogo sizePx={14} />
@@ -161,7 +147,7 @@ export function renderPreviewIcon(
/>
)}
{icon.overlay === 'link' ? <LinkOverlay /> : null}
- </SidebarIconSurface>
+ </SidebarIconSlot>
);
}
if (icon.kind === 'avatar') {
@@ -181,21 +167,16 @@ export function renderPreviewIcon(
APP_PREVIEW_TONES.sidebar[icon.tone] ?? APP_PREVIEW_TONES.sidebar.gray;
const TablerIcon = TABLER_ICON_MAP[icon.name];
return (
- <SidebarIconSurface
- $background={tone.background}
- $border={tone.border}
- $color={tone.color}
- $pulse={pulse}
- >
+ <SidebarIconSlot $pulse={pulse}>
{TablerIcon ? (
<TablerIcon
aria-hidden
color={tone.color}
- size={14}
+ size={THEME_LIGHT.icon.size.md}
stroke={THEME_LIGHT.icon.stroke.md}
/>
) : null}
{icon.overlay === 'link' ? <LinkOverlay /> : null}
- </SidebarIconSurface>
+ </SidebarIconSlot>
);
}
diff --git a/packages/twenty-website/src/app-preview/shell/PreviewAppLayout.tsx b/packages/twenty-website/src/app-preview/shell/PreviewAppLayout.tsx
index 60bf551768e..d5c77b58408 100644
--- a/packages/twenty-website/src/app-preview/shell/PreviewAppLayout.tsx
+++ b/packages/twenty-website/src/app-preview/shell/PreviewAppLayout.tsx
@@ -3,7 +3,6 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { mediaUp } from '@/tokens';
import { THEME_LIGHT } from 'twenty-ui/theme';
import { renderPage } from '../pages/RenderPage';
@@ -29,36 +28,14 @@ const AppLayout = styled.div`
z-index: 1;
`;
-const RightPane = styled.div`
- display: flex;
- flex: 1 1 0;
- flex-direction: column;
- min-height: 0;
- min-width: 0;
- padding-bottom: 12px;
- padding-left: 0;
- padding-right: 8px;
- padding-top: 12px;
- row-gap: 12px;
-
- ${mediaUp('md')} {
- padding-right: 12px;
- }
-`;
-
-const ContentRow = styled.div`
- display: flex;
- flex: 1 1 auto;
- min-height: 0;
-`;
-
-// The morph squeezes the named workflow's canvas into the compact frame.
-const IndexSurface = styled.div`
+// The product's page card: flush against the drawer, separated from it by
+// the drawer's rule and the card's leftward shadow only. The morph squeezes
+// the named workflow's canvas into the compact frame.
+const PageCard = styled.div`
background: ${THEME_LIGHT.background.primary};
- border: 1px solid ${THEME_LIGHT.border.color.medium};
- border-radius: ${THEME_LIGHT.border.radius.md};
+ box-shadow: ${THEME_LIGHT.boxShadow.sidebar};
display: flex;
- flex: 1 1 auto;
+ flex: 1 1 0;
flex-direction: column;
min-height: 0;
min-width: 0;
@@ -71,12 +48,12 @@ const IndexSurface = styled.div`
}
`;
-// The Ask-AI aside reveals through one CSS custom property the scroll
-// choreography writes (no per-frame React work); static mounts inherit
-// the fully-open default.
+// The Ask-AI aside floats in its own gutter beside the card, and reveals
+// through one CSS custom property the scroll choreography writes (no
+// per-frame React work); static mounts inherit the fully-open default.
const AsideSlot = styled.div`
flex: 0 0 auto;
- margin-left: calc(var(--ai-panel-progress, 1) * 8px);
+ margin: 12px 12px 12px calc(var(--ai-panel-progress, 1) * 8px);
overflow: hidden;
width: calc(var(--ai-panel-progress, 1) * 280px);
`;
@@ -149,33 +126,25 @@ export function PreviewAppLayout({
selectedItemId={activeItemId}
workspace={workspaceEntries}
/>
- <RightPane>
+ <PageCard data-compact-workflow={compactWorkflowPage ? '' : undefined}>
<PreviewNavbar
activeItem={activeItem}
activeItemLabel={navbarLabel}
navbarActions={navbarActions}
revealedObjectIds={revealedObjectIds}
/>
- <ContentRow>
- <IndexSurface
- data-compact-workflow={compactWorkflowPage ? '' : undefined}
- >
- {showViewbar ? (
- <PreviewViewbar
- actions={page.header.actions ?? []}
- count={page.header.count}
- pageType={page.type}
- showListIcon={page.header.showListIcon ?? false}
- title={page.header.title}
- />
- ) : null}
- {renderPage(page)}
- </IndexSurface>
- {rightAside !== undefined ? (
- <AsideSlot>{rightAside}</AsideSlot>
- ) : null}
- </ContentRow>
- </RightPane>
+ {showViewbar ? (
+ <PreviewViewbar
+ actions={page.header.actions ?? []}
+ count={page.header.count}
+ pageType={page.type}
+ showListIcon={page.header.showListIcon ?? false}
+ title={page.header.title}
+ />
+ ) : null}
+ {renderPage(page)}
+ </PageCard>
+ {rightAside !== undefined ? <AsideSlot>{rightAside}</AsideSlot> : null}
</AppLayout>
);
}
diff --git a/packages/twenty-website/src/app-preview/shell/PreviewNavbar.tsx b/packages/twenty-website/src/app-preview/shell/PreviewNavbar.tsx
index f845e352c3a..4739a890d19 100644
--- a/packages/twenty-website/src/app-preview/shell/PreviewNavbar.tsx
+++ b/packages/twenty-website/src/app-preview/shell/PreviewNavbar.tsx
@@ -40,15 +40,23 @@ const NAVBAR_ACTION_ICON_MAP: Record<string, typeof IconPlus> = {
rocket: IconRocket,
};
+// twenty-ui sizes a labelled button's start icon at icon.size.sm, and an
+// icon-only button's at icon.size.md.
+const LABELLED_ACTION_ICON_SIZE_PX = THEME_LIGHT.icon.size.sm;
+const ICON_ONLY_ACTION_ICON_SIZE_PX = THEME_LIGHT.icon.size.md;
+
const NavbarBar = styled.div`
align-items: center;
- background: transparent;
+ background: ${THEME_LIGHT.background.secondary};
+ border-bottom: 1px solid ${THEME_LIGHT.border.color.light};
+ box-sizing: border-box;
display: grid;
- flex: 0 0 32px;
+ flex-shrink: 0;
grid-template-columns: minmax(0, 1fr) auto;
gap: 8px;
- height: 32px;
+ height: ${APP_PREVIEW_CHROME.appHeaderHeightPx}px;
min-width: 0;
+ padding: 0 12px;
width: 100%;
`;
@@ -102,21 +110,23 @@ const NavbarActions = styled.div`
pointer-events: none;
`;
-const DesktopOnlyAction = styled.div`
+const DesktopOnlyActions = styled.div`
display: none;
flex: 0 1 auto;
+ gap: 8px;
min-width: 0;
${mediaUp('md')} {
- display: block;
+ display: flex;
}
`;
const ActionButton = styled.div<{ $iconOnly?: boolean }>`
align-items: center;
- background: transparent;
+ background: ${THEME_LIGHT.background.transparent.lighter};
border: 1px solid ${THEME_LIGHT.background.transparent.medium};
- border-radius: ${THEME_LIGHT.border.radius.sm};
+ border-radius: ${THEME_LIGHT.border.radius.md};
+ color: ${THEME_LIGHT.font.color.secondary};
display: inline-flex;
flex: 0 1 auto;
font-family: var(--font-product), sans-serif;
@@ -132,17 +142,22 @@ const ActionButton = styled.div<{ $iconOnly?: boolean }>`
white-space: nowrap;
`;
+const PrimaryActionButton = styled(ActionButton)`
+ background: ${THEME_LIGHT.color.blue};
+ border-color: ${THEME_LIGHT.background.transparent.light};
+ color: ${THEME_LIGHT.font.color.inverted};
+`;
+
const ActionIconWrap = styled.span`
align-items: center;
- color: ${THEME_LIGHT.font.color.secondary};
+ color: inherit;
display: flex;
flex: 0 0 auto;
justify-content: center;
`;
-const ActionLabel = styled.span<{ $light?: boolean }>`
- color: ${({ $light }) =>
- $light ? THEME_LIGHT.font.color.light : THEME_LIGHT.font.color.secondary};
+const ActionLabel = styled.span`
+ color: inherit;
font-family: inherit;
font-size: inherit;
font-weight: inherit;
@@ -153,24 +168,6 @@ const ActionLabel = styled.span<{ $light?: boolean }>`
white-space: nowrap;
`;
-const DesktopOnlyTrailing = styled.div`
- align-items: center;
- display: none;
- gap: ${APP_PREVIEW_CHROME.spacingBasePx}px;
- height: 100%;
-
- ${mediaUp('md')} {
- display: inline-flex;
- }
-`;
-
-const ActionSeparator = styled.div`
- background: ${THEME_LIGHT.background.transparent.medium};
- border-radius: 56px;
- height: 100%;
- width: 1px;
-`;
-
const PinnedActionButton = styled(ActionButton)<{
$pinnedActionIndex: number;
}>`
@@ -204,27 +201,23 @@ const PinnedActionButton = styled(ActionButton)<{
function renderProvidedAction(action: NavbarAction, index: number) {
const Icon = NAVBAR_ACTION_ICON_MAP[action.icon];
+ const iconOnly = action.variant === 'icon' || !action.label;
return (
- <ActionButton
- $iconOnly={action.variant === 'icon' || !action.label}
- key={`${action.icon}-${index}`}
- >
+ <ActionButton $iconOnly={iconOnly} key={`${action.icon}-${index}`}>
{Icon ? (
<ActionIconWrap>
<Icon
aria-hidden
- size={THEME_LIGHT.icon.size.sm}
+ size={
+ iconOnly
+ ? ICON_ONLY_ACTION_ICON_SIZE_PX
+ : LABELLED_ACTION_ICON_SIZE_PX
+ }
stroke={THEME_LIGHT.icon.stroke.md}
/>
</ActionIconWrap>
) : null}
{action.label ? <ActionLabel>{action.label}</ActionLabel> : null}
- {action.trailingLabel ? (
- <DesktopOnlyTrailing>
- <ActionSeparator />
- <ActionLabel $light>{action.trailingLabel}</ActionLabel>
- </DesktopOnlyTrailing>
- ) : null}
</ActionButton>
);
}
@@ -245,7 +238,7 @@ function renderPinnedAction(
<ActionIconWrap>
<Icon
aria-hidden
- size={THEME_LIGHT.icon.size.sm}
+ size={LABELLED_ACTION_ICON_SIZE_PX}
stroke={THEME_LIGHT.icon.stroke.md}
/>
</ActionIconWrap>
@@ -309,30 +302,44 @@ function DefaultActions({
{pinnedActions?.map((action, index) =>
renderPinnedAction(action, index, activeItem?.id),
)}
- <DesktopOnlyAction>
- <ActionButton>
+ <DesktopOnlyActions>
+ <PrimaryActionButton>
<ActionIconWrap>
<IconPlus
aria-hidden
- size={THEME_LIGHT.icon.size.sm}
+ size={LABELLED_ACTION_ICON_SIZE_PX}
+ stroke={THEME_LIGHT.icon.stroke.md}
+ />
+ </ActionIconWrap>
+ <ActionLabel>New Record</ActionLabel>
+ </PrimaryActionButton>
+ <ActionButton $iconOnly>
+ <ActionIconWrap>
+ <IconChevronUp
+ aria-hidden
+ size={ICON_ONLY_ACTION_ICON_SIZE_PX}
+ stroke={THEME_LIGHT.icon.stroke.md}
+ />
+ </ActionIconWrap>
+ </ActionButton>
+ <ActionButton $iconOnly>
+ <ActionIconWrap>
+ <IconChevronDown
+ aria-hidden
+ size={ICON_ONLY_ACTION_ICON_SIZE_PX}
stroke={THEME_LIGHT.icon.stroke.md}
/>
</ActionIconWrap>
- <ActionLabel>New</ActionLabel>
</ActionButton>
- </DesktopOnlyAction>
- <ActionButton>
+ </DesktopOnlyActions>
+ <ActionButton $iconOnly>
<ActionIconWrap>
<IconDotsVertical
aria-hidden
- size={THEME_LIGHT.icon.size.sm}
+ size={ICON_ONLY_ACTION_ICON_SIZE_PX}
stroke={THEME_LIGHT.icon.stroke.md}
/>
</ActionIconWrap>
- <DesktopOnlyTrailing>
- <ActionSeparator />
- <ActionLabel $light>⌘K</ActionLabel>
- </DesktopOnlyTrailing>
</ActionButton>
</>
);
diff --git a/packages/twenty-website/src/app-preview/shell/PreviewSidebar.tsx b/packages/twenty-website/src/app-preview/shell/PreviewSidebar.tsx
index c652533b6b7..952947c97e9 100644
--- a/packages/twenty-website/src/app-preview/shell/PreviewSidebar.tsx
+++ b/packages/twenty-website/src/app-preview/shell/PreviewSidebar.tsx
@@ -7,33 +7,33 @@ import {
IconSearch,
} from '@tabler/icons-react';
-import { AppleRainbowMark } from '@/icons';
+import { AppleWorkspaceMark } from '@/icons';
import { mediaUp } from '@/tokens';
import { THEME_LIGHT } from 'twenty-ui/theme';
import { previewFontSize } from '@/app-preview/preview-font-size';
import { APP_PREVIEW_CHROME } from '@/app-preview/app-preview-chrome';
-import { SidebarControls } from './SidebarControls';
import { SidebarFolder } from './SidebarFolder';
import { SidebarItem } from './SidebarItem';
+import { SidebarModeSwitcher } from './SidebarModeSwitcher';
import { renderPreviewIcon } from '../primitives/PreviewIcon';
import { isSidebarFolder } from './is-sidebar-folder';
import { type SidebarEntry, type SidebarItemDef } from '../types';
+const DRAWER_PADDING_PX = APP_PREVIEW_CHROME.navigationDrawerPaddingPx;
+
const SidebarPanel = styled.aside`
- background: transparent;
+ background: ${THEME_LIGHT.grayScale.gray3};
+ border-right: 1px solid ${THEME_LIGHT.border.color.medium};
+ box-sizing: border-box;
display: flex;
flex-direction: column;
flex-shrink: 0;
min-height: 0;
- padding: 8px 4px;
- row-gap: 8px;
width: 48px;
${mediaUp('md')} {
&[data-desktop-mode='expanded'] {
- padding: 12px 8px;
- row-gap: 12px;
width: ${APP_PREVIEW_CHROME.navigationDrawerWidthPx}px;
}
}
@@ -43,13 +43,17 @@ const Header = styled.div`
align-items: center;
display: flex;
flex-direction: column;
+ padding: ${DRAWER_PADDING_PX}px 4px;
row-gap: 16px;
- padding: 8px 4px;
${mediaUp('md')} {
[data-desktop-mode='expanded'] & {
+ border-bottom: 1px solid ${THEME_LIGHT.border.color.medium};
+ box-sizing: border-box;
flex-direction: row;
+ height: ${APP_PREVIEW_CHROME.appHeaderHeightPx}px;
justify-content: space-between;
+ padding: 0 ${DRAWER_PADDING_PX}px;
row-gap: 0;
}
}
@@ -63,8 +67,9 @@ const HeaderLeft = styled.div`
${mediaUp('md')} {
[data-desktop-mode='expanded'] & {
- column-gap: 8px;
+ column-gap: ${DRAWER_PADDING_PX}px;
justify-content: flex-start;
+ padding: 0 4px;
width: auto;
}
}
@@ -103,12 +108,35 @@ const HeaderRight = styled.div`
${mediaUp('md')} {
[data-desktop-mode='expanded'] & {
- column-gap: 8px;
+ column-gap: 2px;
flex-direction: row;
}
}
`;
+const HeaderButton = styled.span`
+ align-items: center;
+ display: flex;
+ height: 24px;
+ justify-content: center;
+ width: 24px;
+`;
+
+const DrawerContent = styled.div`
+ display: flex;
+ flex: 1 1 auto;
+ flex-direction: column;
+ min-height: 0;
+ padding: 0 4px ${DRAWER_PADDING_PX}px;
+ row-gap: ${DRAWER_PADDING_PX}px;
+
+ ${mediaUp('md')} {
+ [data-desktop-mode='expanded'] & {
+ padding: 0 ${DRAWER_PADDING_PX}px ${DRAWER_PADDING_PX * 2}px;
+ }
+ }
+`;
+
const SectionLabelRow = styled.div`
align-items: center;
display: flex;
@@ -139,7 +167,7 @@ const RailOnly = styled.div`
flex: 1 1 auto;
flex-direction: column;
min-height: 0;
- row-gap: 8px;
+ row-gap: ${DRAWER_PADDING_PX}px;
${mediaUp('md')} {
[data-desktop-mode='expanded'] & {
@@ -202,7 +230,7 @@ export function PreviewSidebar({
<SidebarPanel aria-hidden data-desktop-mode={desktopMode}>
<Header>
<HeaderLeft>
- <AppleRainbowMark sizePx={16} />
+ <AppleWorkspaceMark sizePx={16} />
<WorkspaceName>Apple</WorkspaceName>
<DesktopOnly>
<IconChevronDown
@@ -214,67 +242,73 @@ export function PreviewSidebar({
<HeaderRight>
<IconSearch color={THEME_LIGHT.font.color.secondary} size={16} />
<DesktopOnly>
- <IconLayoutSidebarLeftCollapse
- color={THEME_LIGHT.font.color.secondary}
- size={16}
- />
+ <HeaderButton>
+ <IconLayoutSidebarLeftCollapse
+ color={THEME_LIGHT.font.color.secondary}
+ size={16}
+ />
+ </HeaderButton>
</DesktopOnly>
</HeaderRight>
</Header>
- <SidebarControls />
- <RailOnly>
- {railItems.map((item) => (
- <RailIconSlot data-rail-item-id={item.id} key={item.id}>
- {renderPreviewIcon(item.icon)}
- </RailIconSlot>
- ))}
- </RailOnly>
- <DesktopContent>
- <div>
- <SectionLabelRow>
- <SectionLabel>Favorites</SectionLabel>
- </SectionLabelRow>
- <SectionStack>
- {favorites.map((item) => (
- <SidebarItem
- active={item.id === selectedItemId}
- item={item}
- key={item.id}
- onSelect={onSelectPageItem}
- />
- ))}
- </SectionStack>
- </div>
- <div>
- <SectionLabelRow>
- <SectionLabel>Workspace</SectionLabel>
- </SectionLabelRow>
- <SectionStack>
- {visibleWorkspace.map((entry) =>
- isSidebarFolder(entry) ? (
- <SidebarFolder
- expanded={openFolderIds?.includes(entry.id) ?? false}
- folder={entry}
- key={entry.id}
- onSelectItem={onSelectPageItem}
- onToggleExpanded={
- onToggleFolder ? () => onToggleFolder(entry.id) : undefined
- }
- selectedItemId={selectedItemId}
- />
- ) : (
+ <DrawerContent>
+ <SidebarModeSwitcher />
+ <RailOnly>
+ {railItems.map((item) => (
+ <RailIconSlot data-rail-item-id={item.id} key={item.id}>
+ {renderPreviewIcon(item.icon)}
+ </RailIconSlot>
+ ))}
+ </RailOnly>
+ <DesktopContent>
+ <div>
+ <SectionLabelRow>
+ <SectionLabel>Favorites</SectionLabel>
+ </SectionLabelRow>
+ <SectionStack>
+ {favorites.map((item) => (
<SidebarItem
- active={entry.id === selectedItemId}
- highlighted={entry.id === highlightedItemId}
- item={entry}
- key={entry.id}
+ active={item.id === selectedItemId}
+ item={item}
+ key={item.id}
onSelect={onSelectPageItem}
/>
- ),
- )}
- </SectionStack>
- </div>
- </DesktopContent>
+ ))}
+ </SectionStack>
+ </div>
+ <div>
+ <SectionLabelRow>
+ <SectionLabel>Workspace</SectionLabel>
+ </SectionLabelRow>
+ <SectionStack>
+ {visibleWorkspace.map((entry) =>
+ isSidebarFolder(entry) ? (
+ <SidebarFolder
+ expanded={openFolderIds?.includes(entry.id) ?? false}
+ folder={entry}
+ key={entry.id}
+ onSelectItem={onSelectPageItem}
+ onToggleExpanded={
+ onToggleFolder
+ ? () => onToggleFolder(entry.id)
+ : undefined
+ }
+ selectedItemId={selectedItemId}
+ />
+ ) : (
+ <SidebarItem
+ active={entry.id === selectedItemId}
+ highlighted={entry.id === highlightedItemId}
+ item={entry}
+ key={entry.id}
+ onSelect={onSelectPageItem}
+ />
+ ),
+ )}
+ </SectionStack>
+ </div>
+ </DesktopContent>
+ </DrawerContent>
</SidebarPanel>
);
}
diff --git a/packages/twenty-website/src/app-preview/shell/SidebarControls.tsx b/packages/twenty-website/src/app-preview/shell/SidebarControls.tsx
deleted file mode 100644
index f83dda62ce8..00000000000
--- a/packages/twenty-website/src/app-preview/shell/SidebarControls.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { styled } from '@linaria/react';
-import {
- IconHome,
- IconMessageCircle2,
- IconMessageCirclePlus,
-} from '@tabler/icons-react';
-
-import { mediaUp } from '@/tokens';
-import { THEME_LIGHT } from 'twenty-ui/theme';
-import { previewFontSize } from '@/app-preview/preview-font-size';
-
-const Root = styled.div`
- display: flex;
- justify-content: center;
-
- ${mediaUp('md')} {
- align-items: center;
- justify-content: space-between;
- }
-`;
-
-const SegmentedRail = styled.div`
- display: none;
-
- ${mediaUp('md')} {
- display: flex;
- align-items: center;
- /* The old hand-mixed #fcfcfccc: the secondary surface at 80%. */
- background-color: color-mix(
- in srgb,
- ${THEME_LIGHT.background.secondary} 80%,
- transparent
- );
- border: 1px solid ${THEME_LIGHT.border.color.medium};
- border-radius: ${THEME_LIGHT.border.radius.pill};
- column-gap: 2px;
- height: 26px;
- padding: 3px;
- }
-`;
-
-const Segment = styled.div<{ $selected?: boolean }>`
- align-items: center;
- background: ${({ $selected }) =>
- $selected ? THEME_LIGHT.background.transparent.light : 'transparent'};
- border-radius: ${THEME_LIGHT.border.radius.pill};
- display: flex;
- height: 20px;
- justify-content: center;
- width: 32px;
-`;
-
-const NewChat = styled.div`
- align-items: center;
- background-color: ${THEME_LIGHT.background.secondary};
- border: 1px solid ${THEME_LIGHT.border.color.medium};
- border-radius: ${THEME_LIGHT.border.radius.pill};
- color: ${THEME_LIGHT.font.color.secondary};
- display: flex;
- height: 32px;
- justify-content: center;
- width: 32px;
-
- ${mediaUp('md')} {
- column-gap: 4px;
- height: 26px;
- padding: 3px;
- width: 103px;
- }
-`;
-
-const NewChatLabel = styled.span`
- display: none;
-
- ${mediaUp('md')} {
- display: block;
- font-family: var(--font-product), sans-serif;
- font-size: ${previewFontSize(THEME_LIGHT.font.size.md)};
- font-weight: ${THEME_LIGHT.font.weight.medium};
- line-height: 1.4;
- }
-`;
-
-// The home/chat rail + "New chat" pill — chrome only, as on the old
-// site: the AI conversation lives in the floating Terminal.
-export function SidebarControls() {
- return (
- <Root>
- <SegmentedRail aria-hidden>
- <Segment $selected>
- <IconHome
- aria-hidden
- color={THEME_LIGHT.font.color.primary}
- size={16}
- strokeWidth={THEME_LIGHT.icon.stroke.md}
- />
- </Segment>
- <Segment>
- <IconMessageCircle2
- aria-hidden
- color={THEME_LIGHT.font.color.tertiary}
- size={16}
- strokeWidth={THEME_LIGHT.icon.stroke.md}
- />
- </Segment>
- </SegmentedRail>
- <NewChat aria-hidden>
- <IconMessageCirclePlus
- aria-hidden
- color={THEME_LIGHT.font.color.secondary}
- size={16}
- strokeWidth={THEME_LIGHT.icon.stroke.md}
- />
- <NewChatLabel>New chat</NewChatLabel>
- </NewChat>
- </Root>
- );
-}
diff --git a/packages/twenty-website/src/app-preview/shell/SidebarFolder.tsx b/packages/twenty-website/src/app-preview/shell/SidebarFolder.tsx
index 2b2e1da2f7e..d14561426d7 100644
--- a/packages/twenty-website/src/app-preview/shell/SidebarFolder.tsx
+++ b/packages/twenty-website/src/app-preview/shell/SidebarFolder.tsx
@@ -112,7 +112,7 @@ export function SidebarFolder({
<MiniIcon
color={THEME_LIGHT.font.color.tertiary}
icon={IconChevronDown}
- size={12}
+ size={THEME_LIGHT.icon.size.sm}
/>
</FolderChevron>
</FolderButton>
diff --git a/packages/twenty-website/src/app-preview/shell/SidebarModeSwitcher.tsx b/packages/twenty-website/src/app-preview/shell/SidebarModeSwitcher.tsx
new file mode 100644
index 00000000000..3f5bbe107c8
--- /dev/null
+++ b/packages/twenty-website/src/app-preview/shell/SidebarModeSwitcher.tsx
@@ -0,0 +1,100 @@
+import { styled } from '@linaria/react';
+import { IconHome, IconMessageCircle, IconSettings } from '@tabler/icons-react';
+
+import { mediaUp } from '@/tokens';
+import { THEME_LIGHT } from 'twenty-ui/theme';
+import { previewFontSize } from '@/app-preview/preview-font-size';
+import { APP_PREVIEW_CHROME } from '@/app-preview/app-preview-chrome';
+
+// Collapsed, the product stacks the modes as square icon buttons
+// (NavigationDrawerCollapsedButtonSize); expanded, it lays them out as a
+// labelled row above the menu's rule.
+const COLLAPSED_BUTTON_SIZE_PX = 32;
+
+const Root = styled.div`
+ align-items: center;
+ display: flex;
+ flex-direction: column;
+ row-gap: 2px;
+
+ ${mediaUp('md')} {
+ [data-desktop-mode='expanded'] & {
+ border-bottom: 1px solid ${THEME_LIGHT.border.color.light};
+ box-sizing: border-box;
+ column-gap: 2px;
+ flex-direction: row;
+ height: ${APP_PREVIEW_CHROME.spacingBasePx * 10}px;
+ row-gap: 0;
+ }
+ }
+`;
+
+const Mode = styled.div<{ $selected?: boolean }>`
+ align-items: center;
+ background: ${({ $selected }) =>
+ $selected ? THEME_LIGHT.background.transparent.light : 'transparent'};
+ border-radius: ${THEME_LIGHT.border.radius.mdRound};
+ color: ${({ $selected }) =>
+ $selected
+ ? THEME_LIGHT.font.color.primary
+ : THEME_LIGHT.font.color.tertiary};
+ display: flex;
+ flex-shrink: 0;
+ height: ${COLLAPSED_BUTTON_SIZE_PX}px;
+ justify-content: center;
+ width: ${COLLAPSED_BUTTON_SIZE_PX}px;
+
+ ${mediaUp('md')} {
+ [data-desktop-mode='expanded'] & {
+ border-radius: ${THEME_LIGHT.border.radius.smRound};
+ column-gap: ${({ $selected }) => ($selected ? '4px' : '0')};
+ height: ${APP_PREVIEW_CHROME.spacingBasePx * 7}px;
+ justify-content: flex-start;
+ padding: 0 6px;
+ width: auto;
+ }
+ }
+`;
+
+// Collapsed the modes are icon-only, so the active mode's label is an
+// expanded-drawer affordance.
+const ModeLabel = styled.span`
+ display: none;
+
+ ${mediaUp('md')} {
+ [data-desktop-mode='expanded'] & {
+ display: block;
+ font-family: var(--font-product), sans-serif;
+ font-size: ${previewFontSize(THEME_LIGHT.font.size.md)};
+ font-weight: ${THEME_LIGHT.font.weight.medium};
+ line-height: 1.4;
+ white-space: nowrap;
+ }
+ }
+`;
+
+// Only the active mode carries its label, as the product's switcher does.
+const NAVIGATION_MODES = [
+ { Icon: IconHome, label: 'Home', selected: true },
+ { Icon: IconMessageCircle, label: 'AI', selected: false },
+ { Icon: IconSettings, label: 'Settings', selected: false },
+];
+
+// The drawer's Home/AI/Settings switcher — chrome only, as on the old site:
+// the AI conversation lives in the floating Terminal.
+export function SidebarModeSwitcher() {
+ return (
+ <Root aria-hidden>
+ {NAVIGATION_MODES.map(({ Icon, label, selected }) => (
+ <Mode $selected={selected} key={label}>
+ <Icon
+ aria-hidden
+ size={THEME_LIGHT.icon.size.md}
+ strokeWidth={THEME_LIGHT.icon.stroke.md}
+ />
+ {selected ? <ModeLabel>{label}</ModeLabel> : null}
+ </Mode>
+ ))}
+ </Root>
+ );
+}
diff --git a/packages/twenty-website/src/app-preview/types.ts b/packages/twenty-website/src/app-preview/types.ts
index 9da82ab242d..b827177c62a 100644
--- a/packages/twenty-website/src/app-preview/types.ts
+++ b/packages/twenty-website/src/app-preview/types.ts
@@ -2,7 +2,6 @@
export type CellText = {
type: 'text';
- targetPageItemId?: string;
value: string;
shortLabel?: string;
tone?: string;
@@ -64,6 +63,9 @@ export type ColumnDef = {
label: string;
width: number;
align?: 'left' | 'right';
+ // Set when the field name is shared across objects (every object's label
+ // identifier is `name`), so the header still shows the object's own icon.
+ icon?: string;
isFirstColumn?: boolean;
};
export type RowDef = {
@@ -74,10 +76,7 @@ export type RowDef = {
export type NavbarAction = {
icon: string;
label?: string;
- trailingLabel?: string;
- labelTone?: 'primary' | 'secondary' | 'tertiary';
variant?: 'icon';
- desktopOnly?: boolean;
};
export type PageHeader = {
@@ -156,7 +155,6 @@ export type WorkflowPageDefinition = {
generating?: boolean;
header: PageHeader;
nodes?: WorkflowNodeDef[];
- plusNode?: { x: number; y: number };
type: 'workflow';
};
diff --git a/packages/twenty-website/src/icons/AppleRainbowMark.tsx b/packages/twenty-website/src/icons/AppleRainbowMark.tsx
deleted file mode 100644
index 302c49a8687..00000000000
--- a/packages/twenty-website/src/icons/AppleRainbowMark.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useId } from 'react';
-
-import { ICON_INKS } from '@/tokens';
-
-const STRIPES = [
- { fill: ICON_INKS.appleStripes.green, y: 37.45, height: 64.55 },
- { fill: ICON_INKS.appleStripes.yellow, y: 88.65, height: 26.7 },
- { fill: ICON_INKS.appleStripes.orange, y: 102, height: 26.7 },
- { fill: ICON_INKS.appleStripes.red, y: 115.35, height: 26.7 },
- { fill: ICON_INKS.appleStripes.purple, y: 128.7, height: 26.68 },
- { fill: ICON_INKS.appleStripes.blue, y: 142.06, height: 26.68 },
-];
-
-// The mockup workspace's rainbow apple (authored artwork, verbatim). The
-// clip path id is instance-unique so several mounts never collide.
-export function AppleRainbowMark({ sizePx = 16 }: { sizePx?: number }) {
- const clipId = useId();
-
- return (
- <svg
- aria-hidden
- height={sizePx}
- viewBox="0 0 89.89 104.6"
- width={sizePx}
- xmlns="http://www.w3.org/2000/svg"
- >
- <defs>
- <clipPath id={clipId}>
- <path d="M150.97 50.8c-9.07.38-19.66 3.95-25.85 8.6-5.62 4.21-10.26 10.47-8.46 16.56 9.9.19 20.13-3.47 26.07-8.18 5.55-4.4 9.77-10.63 8.24-16.99m3.35 24.48c-15.27 0-21.72 4.49-32.31 4.49-10.92 0-19.23-4.49-32.43-4.49-12.98 0-26.77 4.88-35.51 13.21l-.16.16A24.3 24.3 0 0 0 46.88 102c-.76 4.14-.56 8.66.62 13.35a46 46 0 0 0 5.93 13.35 65 65 0 0 0 11.45 13.35c7 6.45 16.2 13.28 28.04 13.34 11.08.07 14.21-4.37 29.24-4.42s17.87 4.47 28.94 4.4c11.35-.05 20.7-7 27.67-13.32l1.98-1.83a70 70 0 0 0 10.12-11.51l.87-1.18c-9.96-2.32-17.03-6.85-20.85-12.18-3-4.18-4-8.86-2.81-13.35 1.31-4.98 5.3-9.73 12.2-13.35a45 45 0 0 1 6.52-2.76c-8.72-6.72-20.95-10.61-32.48-10.61" />
- </clipPath>
- </defs>
- <g
- clipPath={`url(#${clipId})`}
- transform="matrix(.61862 0 0 1 -28.72 -50.8)"
- >
- <g strokeLinecap="round">
- {STRIPES.map((stripe) => (
- <rect
- fill={stripe.fill}
- height={stripe.height}
- key={stripe.fill}
- width={188.44}
- x={24.86}
- y={stripe.y}
- />
- ))}
- </g>
- </g>
- </svg>
- );
-}
diff --git a/packages/twenty-website/src/icons/AppleWorkspaceMark.tsx b/packages/twenty-website/src/icons/AppleWorkspaceMark.tsx
new file mode 100644
index 00000000000..c9fb597bbb7
--- /dev/null
+++ b/packages/twenty-website/src/icons/AppleWorkspaceMark.tsx
@@ -0,0 +1,26 @@
+import { ICON_INKS } from '@/tokens';
+
+// The mockup workspace's logo tile, as the product's navigation renders a
+// workspace logo: the authored Apple silhouette, white on its black tile.
+export function AppleWorkspaceMark({ sizePx = 16 }: { sizePx?: number }) {
+ return (
+ <svg
+ aria-hidden
+ height={sizePx}
+ viewBox="0 0 16 16"
+ width={sizePx}
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <rect fill={ICON_INKS.appleTile} height="16" rx="2" width="16" />
+ {/* The silhouette is authored in its own 89.89x104.6 space: the inner
+ matrix is verbatim from that artwork, the outer one seats it. */}
+ <g transform="translate(3.4 1.9) scale(.113)">
+ <path
+ d="M150.97 50.8c-9.07.38-19.66 3.95-25.85 8.6-5.62 4.21-10.26 10.47-8.46 16.56 9.9.19 20.13-3.47 26.07-8.18 5.55-4.4 9.77-10.63 8.24-16.99m3.35 24.48c-15.27 0-21.72 4.49-32.31 4.49-10.92 0-19.23-4.49-32.43-4.49-12.98 0-26.77 4.88-35.51 13.21l-.16.16A24.3 24.3 0 0 0 46.88 102c-.76 4.14-.56 8.66.62 13.35a46 46 0 0 0 5.93 13.35 65 65 0 0 0 11.45 13.35c7 6.45 16.2 13.28 28.04 13.34 11.08.07 14.21-4.37 29.24-4.42s17.87 4.47 28.94 4.4c11.35-.05 20.7-7 27.67-13.32l1.98-1.83a70 70 0 0 0 10.12-11.51l.87-1.18c-9.96-2.32-17.03-6.85-20.85-12.18-3-4.18-4-8.86-2.81-13.35 1.31-4.98 5.3-9.73 12.2-13.35a45 45 0 0 1 6.52-2.76c-8.72-6.72-20.95-10.61-32.48-10.61"
+ fill={ICON_INKS.appleGlyph}
+ transform="matrix(.61862 0 0 1 -28.72 -50.8)"
+ />
+ </g>
+ </svg>
+ );
+}
diff --git a/packages/twenty-website/src/icons/index.ts b/packages/twenty-website/src/icons/index.ts
index 6984dfeadf6..7a9e2a87c23 100644
--- a/packages/twenty-website/src/icons/index.ts
+++ b/packages/twenty-website/src/icons/index.ts
@@ -1,4 +1,4 @@
-export { AppleRainbowMark } from './AppleRainbowMark';
+export { AppleWorkspaceMark } from './AppleWorkspaceMark';
export { ArrowLeft, type ArrowLeftProps } from './ArrowLeft';
export { ArrowRight, type ArrowRightProps } from './ArrowRight';
export { ArrowUpRight, type ArrowUpRightProps } from './ArrowUpRight';
diff --git a/packages/twenty-website/src/tokens/app-preview/app-preview-tones.ts b/packages/twenty-website/src/tokens/app-preview/app-preview-tones.ts
index 650b9d9a44c..2937e4aefe7 100644
--- a/packages/twenty-website/src/tokens/app-preview/app-preview-tones.ts
+++ b/packages/twenty-website/src/tokens/app-preview/app-preview-tones.ts
@@ -1,6 +1,6 @@
// The mockup's tone tables (single module). Every product-color group derives
-// straight from twenty-ui: TAG (tag color3/11), SIDEBAR (TintedIconTile
-// color5/6/11), DASHBOARD_CHART (graph color8), WORKFLOW_CANVAS (blue/red +
+// straight from twenty-ui: TAG (tag color3/11), SIDEBAR (nav icon color11 +
+// avatar color5), DASHBOARD_CHART (graph color8), WORKFLOW_CANVAS (blue/red +
// turquoise tag), WORKFLOW_AVATAR_INK (gray11), RECORD_FILE_SHEET_INK
// (turquoise), PRODUCT_VISUAL washes (transparent ramp + primary ink).
// Only genuinely authored marketing art remains: TERMINAL + EDITOR (the
@@ -8,7 +8,6 @@
// box-shadows (e.g. RECORD_NOTE_HIGHLIGHT_SHADOW).
import { THEME_LIGHT } from 'twenty-ui/theme';
-type ToneSurface = { background: string; border: string; color: string };
type TonePair = { background: string; color: string };
// Our tone names map 1:1 onto twenty-ui's tag colors, except `teal` is the
@@ -18,8 +17,8 @@ const tagTone = (name: keyof typeof THEME_LIGHT.tag.text): TonePair => ({
color: THEME_LIGHT.tag.text[name],
});
-// Object nav items render as the product's TintedIconTile: color5 surface,
-// color6 border, color11 icon. (Our `teal` is the product's `turquoise`.)
+// Object nav items render their icon flat in color11; the avatar items keep
+// a color5 surface. (Our `teal` is the product's `turquoise`.)
const sidebarTone = (
name:
| 'amber'
@@ -32,13 +31,12 @@ const sidebarTone = (
| 'red'
| 'turquoise'
| 'violet',
-): ToneSurface => ({
+): TonePair => ({
background: THEME_LIGHT.color[`${name}5`],
- border: THEME_LIGHT.color[`${name}6`],
color: THEME_LIGHT.color[`${name}11`],
});
-const SIDEBAR: Record<string, ToneSurface> = {
+const SIDEBAR: Record<string, TonePair> = {
amber: sidebarTone('amber'),
blue: sidebarTone('blue'),
gray: sidebarTone('gray'),
diff --git a/packages/twenty-website/src/tokens/icon-inks.ts b/packages/twenty-website/src/tokens/icon-inks.ts
index 24c119fc66e..289ca87b60e 100644
--- a/packages/twenty-website/src/tokens/icon-inks.ts
+++ b/packages/twenty-website/src/tokens/icon-inks.ts
@@ -3,13 +3,7 @@
export const ICON_INKS = {
// Anthropic's brand terracotta (the Claude starburst).
claude: '#D97757',
- // The mockup workspace's rainbow apple stripes, top to bottom.
- appleStripes: {
- green: '#75bd21',
- yellow: '#ffc728',
- orange: '#ff661c',
- red: '#cf0f2b',
- purple: '#b01cab',
- blue: '#00a1de',
- },
+ // The mockup workspace's Apple logo tile.
+ appleTile: '#000000',
+ appleGlyph: '#FFFFFF',
};