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.

feat(marketing): /tour mobile polish (#7368)

juliawestfdf2eed17b7e
diff --git a/apps/marketing/src/features/marketing/components/HomepageGithub.tsx b/apps/marketing/src/features/marketing/components/HomepageGithub.tsx
index b92f22723d..0313e44269 100644
--- a/apps/marketing/src/features/marketing/components/HomepageGithub.tsx
+++ b/apps/marketing/src/features/marketing/components/HomepageGithub.tsx
@@ -3,13 +3,10 @@ import {
ensureGithubStars,
githubStars,
} from '../../../app/utils/utilGithubStars';
-import IconCasa from '../../../assets/designs/design-casa.svg';
-import IconIso from '../../../assets/designs/design-iso.svg';
-import IconSoc2 from '../../../assets/designs/design-soc2.svg';
import IconGithub from '../../../assets/icons/icon-github.svg';
-import LogoA16z from '../../../assets/logos/a16z.svg';
import { animateGithubFlow } from './animateGithubFlow';
import { animateOpenSource } from './animateOpenSource';
+import { HomepageTrustBadges } from './HomepageTrustBadges';
import './homepage-github.css';
/** The original open-source proof, fed by the demo's color field. */
@@ -133,20 +130,7 @@ export function HomepageGithub(props: { motion?: 'bubbles' } = {}) {
<br />
Read the code. Make it your own.
</p>
- <div class="homepage-open-source-badges">
- <div class="homepage-open-source-backing">
- <LogoA16z aria-label="Andreessen Horowitz" viewBox="0 0 169 40" />
- <span>Backed by a16z · $30M+ raised</span>
- </div>
- <div class="homepage-open-source-security">
- <div aria-label="Security certifications">
- <IconIso aria-label="ISO 27001" />
- <IconSoc2 aria-label="AICPA SOC 2" />
- <IconCasa aria-label="CASA Tier 2" />
- </div>
- <span>ISO 27001 · SOC 2 · CASA Tier 2</span>
- </div>
- </div>
+ <HomepageTrustBadges />
</section>
);
}
diff --git a/apps/marketing/src/features/marketing/components/HomepageTrustBadges.tsx b/apps/marketing/src/features/marketing/components/HomepageTrustBadges.tsx
new file mode 100644
index 0000000000..97c6edb2fe
--- /dev/null
+++ b/apps/marketing/src/features/marketing/components/HomepageTrustBadges.tsx
@@ -0,0 +1,25 @@
+import IconCasa from '../../../assets/designs/design-casa.svg';
+import IconIso from '../../../assets/designs/design-iso.svg';
+import IconSoc2 from '../../../assets/designs/design-soc2.svg';
+import LogoA16z from '../../../assets/logos/a16z.svg';
+import './homepage-github.css';
+
+/** a16z backing and security certifications from the homepage's open-source section. */
+export function HomepageTrustBadges() {
+ return (
+ <div class="homepage-open-source-badges">
+ <div class="homepage-open-source-backing">
+ <LogoA16z aria-label="Andreessen Horowitz" viewBox="0 0 169 40" />
+ <span>Backed by a16z · $30M+ raised</span>
+ </div>
+ <div class="homepage-open-source-security">
+ <div aria-label="Security certifications">
+ <IconIso aria-label="ISO 27001" />
+ <IconSoc2 aria-label="AICPA SOC 2" />
+ <IconCasa aria-label="CASA Tier 2" />
+ </div>
+ <span>ISO 27001 · SOC 2 · CASA Tier 2</span>
+ </div>
+ </div>
+ );
+}
diff --git a/apps/marketing/src/features/marketing/components/sales/SalesCalculator.tsx b/apps/marketing/src/features/marketing/components/sales/SalesCalculator.tsx
index d52ac83597..0382b1ac49 100644
--- a/apps/marketing/src/features/marketing/components/sales/SalesCalculator.tsx
+++ b/apps/marketing/src/features/marketing/components/sales/SalesCalculator.tsx
@@ -44,124 +44,126 @@ export function SalesCalculator(props: { onBook: () => void }) {
return (
<div class="sales-calc">
- <div class="sales-calc-controls glass">
- <div class="sales-calc-row">
- <span id="sales-calc-seats-label" class="sales-calc-label">
- People on your team
- </span>
- <div class="sales-calc-stepper">
- <button
- type="button"
- aria-label="Remove a person"
- disabled={seats() <= 1}
- onClick={() => stepSeats(-1)}
- >
- <MinusIcon aria-hidden="true" />
- </button>
- <input
- type="number"
- inputmode="numeric"
- min="1"
- max={MAX_SEATS}
- value={seats()}
- aria-labelledby="sales-calc-seats-label"
- onInput={(event) => {
- const next = parseSeats(event.currentTarget.value);
- if (next !== null) setSeats(next);
- }}
- onBlur={(event) => {
- event.currentTarget.value = String(seats());
- }}
- />
- <button
- type="button"
- aria-label="Add a person"
- disabled={seats() >= MAX_SEATS}
- onClick={() => stepSeats(1)}
- >
- <PlusIcon aria-hidden="true" />
- </button>
- </div>
- </div>
- <div
- class="sales-calc-tiers"
- role="group"
- aria-label="Plan you pay for"
- >
- <For each={TIERS}>
- {(option) => (
+ <div class="sales-calc-card">
+ <div class="sales-calc-controls glass">
+ <div class="sales-calc-row">
+ <span id="sales-calc-seats-label" class="sales-calc-label">
+ People on your team
+ </span>
+ <div class="sales-calc-stepper">
<button
type="button"
- aria-pressed={tier() === option.id}
- onClick={() => setTier(option.id)}
+ aria-label="Remove a person"
+ disabled={seats() <= 1}
+ onClick={() => stepSeats(-1)}
>
- {option.label}
+ <MinusIcon aria-hidden="true" />
</button>
- )}
- </For>
- </div>
- <p class="sales-calc-label">Tap everything you pay for</p>
- <ul class="sales-calc-tools" aria-label="Tools you pay for">
- <For each={SAVINGS_TOOLS}>
- {(tool) => {
- const Icon = toolIcons[tool.id];
- return (
- <li>
- <button
- type="button"
- aria-pressed={isSelected(tool.id)}
- aria-label={`${tool.name} ${tierPlan(tool, tier()).name}`}
- onClick={() => toggle(tool.id)}
- >
- <span class="sales-calc-check" aria-hidden="true">
- <CheckIcon />
- </span>
- <Icon class="sales-calc-icon" aria-hidden="true" />
- <span class="sales-calc-name">{tool.name}</span>
- <span class="sales-calc-price">
- {formatWholeUsd(tierMonthlyCents(tool, tier()))}
- </span>
- </button>
- </li>
- );
- }}
- </For>
- </ul>
- </div>
- <div class="sales-calc-result glass" aria-live="polite">
- <div class="sales-calc-lines">
- <p>
- <span>What you pay now</span>
- <s>{formatWholeUsd(result().toolsCents)}/yr</s>
- </p>
- <p>
- <span>Macro</span>
- <strong>{formatWholeUsd(result().macroCents)}/yr</strong>
- </p>
+ <input
+ type="number"
+ inputmode="numeric"
+ min="1"
+ max={MAX_SEATS}
+ value={seats()}
+ aria-labelledby="sales-calc-seats-label"
+ onInput={(event) => {
+ const next = parseSeats(event.currentTarget.value);
+ if (next !== null) setSeats(next);
+ }}
+ onBlur={(event) => {
+ event.currentTarget.value = String(seats());
+ }}
+ />
+ <button
+ type="button"
+ aria-label="Add a person"
+ disabled={seats() >= MAX_SEATS}
+ onClick={() => stepSeats(1)}
+ >
+ <PlusIcon aria-hidden="true" />
+ </button>
+ </div>
+ </div>
+ <div
+ class="sales-calc-tiers"
+ role="group"
+ aria-label="Plan you pay for"
+ >
+ <For each={TIERS}>
+ {(option) => (
+ <button
+ type="button"
+ aria-pressed={tier() === option.id}
+ onClick={() => setTier(option.id)}
+ >
+ {option.label}
+ </button>
+ )}
+ </For>
+ </div>
+ <p class="sales-calc-label">Tap everything you pay for</p>
+ <ul class="sales-calc-tools" aria-label="Tools you pay for">
+ <For each={SAVINGS_TOOLS}>
+ {(tool) => {
+ const Icon = toolIcons[tool.id];
+ return (
+ <li>
+ <button
+ type="button"
+ aria-pressed={isSelected(tool.id)}
+ aria-label={`${tool.name} ${tierPlan(tool, tier()).name}`}
+ onClick={() => toggle(tool.id)}
+ >
+ <span class="sales-calc-check" aria-hidden="true">
+ <CheckIcon />
+ </span>
+ <Icon class="sales-calc-icon" aria-hidden="true" />
+ <span class="sales-calc-name">{tool.name}</span>
+ <span class="sales-calc-price">
+ {formatWholeUsd(tierMonthlyCents(tool, tier()))}
+ </span>
+ </button>
+ </li>
+ );
+ }}
+ </For>
+ </ul>
</div>
- <Show
- when={result().savedCents > 0}
- fallback={
- <p class="sales-calc-even">
- Macro replaces all of it for{' '}
- {formatWholeUsd(result().macroCents / seats() / 12)} a person per
- month.
+ <div class="sales-calc-result glass" aria-live="polite">
+ <div class="sales-calc-lines">
+ <p>
+ <span>What you pay now</span>
+ <s>{formatWholeUsd(result().toolsCents)}/yr</s>
</p>
- }
- >
- <p class="sales-calc-saved">
- <span>You save</span>
- <strong>{formatWholeUsd(result().savedCents)}</strong>
- <span>every year</span>
- </p>
- </Show>
- <button
- type="button"
- class="site-nav-start homepage-hero-cta"
- onClick={() => props.onBook()}
- >
- Book a demo
- </button>
+ <p>
+ <span>Macro</span>
+ <strong>{formatWholeUsd(result().macroCents)}/yr</strong>
+ </p>
+ </div>
+ <Show
+ when={result().savedCents > 0}
+ fallback={
+ <p class="sales-calc-even">
+ Macro replaces all of it for{' '}
+ {formatWholeUsd(result().macroCents / seats() / 12)} a person
+ per month.
+ </p>
+ }
+ >
+ <p class="sales-calc-saved">
+ <span>You save</span>
+ <strong>{formatWholeUsd(result().savedCents)}</strong>
+ <span>every year</span>
+ </p>
+ </Show>
+ <button
+ type="button"
+ class="site-nav-start homepage-hero-cta"
+ onClick={() => props.onBook()}
+ >
+ Book a demo
+ </button>
+ </div>
</div>
<p class="sales-calc-note">
Monthly per-seat prices, billed yearly, from each tool’s pricing page in{' '}
diff --git a/apps/marketing/src/features/marketing/components/sales/sales-calculator.css b/apps/marketing/src/features/marketing/components/sales/sales-calculator.css
index 0ba391c5d6..6258334567 100644
--- a/apps/marketing/src/features/marketing/components/sales/sales-calculator.css
+++ b/apps/marketing/src/features/marketing/components/sales/sales-calculator.css
@@ -35,12 +35,47 @@
.sales-calc-result .homepage-hero-cta { width: 100%; color: #000; }
/* Beats `.feature-page p { margin: 0 }` without !important. */
.sales-calc .sales-calc-note { max-width: 520px; margin: 8px auto 0; color: var(--color-ink-placeholder); font-size: 12px; line-height: 1.7; text-align: center; text-wrap: balance; }
+/* Phones: one card instead of two panels, and compact controls, so team size,
+ tools, savings, and the CTA fit on one screen. */
+@media (max-width: 759px) {
+ .sales-calc { gap: 10px; }
+ .sales-calc-card { display: grid; gap: 14px; padding: 16px 14px; border: 1px solid var(--color-edge-muted); border-radius: 24px; background: var(--color-panel); }
+ .sales-calc-card > :is(.sales-calc-controls, .sales-calc-result) { --glass-backdrop: none; --glass-shadow: none; padding: 0; border-radius: 0; background: none; box-shadow: none; backdrop-filter: none; }
+ .sales-calc-card > :is(.sales-calc-controls, .sales-calc-result)::after { content: none; }
+ .sales-calc-controls { gap: 10px; }
+ .sales-calc-label { font-size: 13px; }
+ .sales-calc-stepper button { width: 34px; height: 34px; }
+ .sales-calc-stepper input { width: 44px; font-size: 16px; }
+ .sales-calc-tiers button { min-height: 34px; font-size: 13px; }
+ .sales-calc-tools { grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 6px; }
+ .sales-calc-tools button { grid-template-columns: 16px minmax(0, 1fr); gap: 2px 6px; min-height: 0; padding: 8px; border-radius: 12px; }
+ .sales-calc-tools .sales-calc-check { display: none; }
+ /* Icon and price on top, the name on its own full-width row so it fits. */
+ .sales-calc-icon { grid-area: 1 / 1; width: 16px; height: 16px; }
+ .sales-calc-price { grid-area: 1 / 2; font-size: 11px; text-align: right; }
+ .sales-calc-name { grid-area: 2 / 1 / 3 / 3; font-size: 12px; }
+ .sales-calc-price::after { content: '/mo'; }
+ .sales-calc-result { gap: 12px; padding-top: 12px; border-top: 1px solid var(--color-edge-muted); }
+ .sales-calc-lines { gap: 4px; }
+ .sales-calc-lines p { font-size: 13px; }
+ .sales-calc-saved { gap: 0; padding-top: 0; border-top: 0; font-size: 13px; }
+ .sales-calc-saved strong { font-size: 44px; }
+ .sales-calc-even { padding-top: 0; border-top: 0; font-size: 14px; }
+ .sales-calc-result .homepage-hero-cta { min-height: 48px; }
+ .sales-calc .sales-calc-note { margin-top: 0; font-size: 11px; }
+}
+/* iPhone SE and other narrow phones: room for "Superhuman" and "Salesforce". */
+@media (max-width: 359px) {
+ .sales-calc-card { padding-inline: 10px; }
+ .sales-calc-tools { gap: 4px; }
+ .sales-calc-tools button { padding: 7px 4px 7px 6px; }
+ .sales-calc-name { font-size: 10.5px; letter-spacing: -.01em; }
+}
@media (min-width: 760px) {
- .sales-calc { grid-template-columns: minmax(0, 1fr) 320px; align-items: start; gap: 20px; }
+ .sales-calc-card { display: grid; grid-template-columns: minmax(0, 1fr) 320px; align-items: start; gap: 20px; }
.sales-calc-controls { padding: 24px; }
.sales-calc-tools { grid-template-columns: repeat(3, minmax(0, 1fr)); }
.sales-calc-result { padding: 28px; }
- .sales-calc-note { grid-column: 1 / -1; }
}
@media (hover: hover) {
.sales-calc-tools button:hover { border-color: var(--color-edge); }
diff --git a/apps/marketing/src/features/marketing/views/SalesPage.tsx b/apps/marketing/src/features/marketing/views/SalesPage.tsx
index bad59f67ae..9fce7de167 100644
--- a/apps/marketing/src/features/marketing/views/SalesPage.tsx
+++ b/apps/marketing/src/features/marketing/views/SalesPage.tsx
@@ -3,6 +3,7 @@ import { setPageSeo } from '../../../app/utils/utilSeo';
import { FeatureConstellation } from '../../setup/components/FeatureOverview';
import { WelcomeStep } from '../../setup/components/WelcomeSteps';
import { FeaturePage } from '../components/FeaturePage';
+import { HomepageTrustBadges } from '../components/HomepageTrustBadges';
import { DemoBookingEmbed } from '../components/sales/DemoBookingEmbed';
import { SalesCalculator } from '../components/sales/SalesCalculator';
import { formatWholeUsd } from '../core/sales-savings';
@@ -65,8 +66,7 @@ export function RouteTour() {
onContinue={() => {}}
title={
<>
- The only app you need{' '}
- <br />
+ The only app you need <br />
for your entire company.
</>
}
@@ -115,7 +115,13 @@ export function RouteTour() {
</span>
</p>
</div>
- <FeatureConstellation expanded />
+ {/* Phones get the compact 8-feature ring; the full grid is too busy. */}
+ <div class="tour-constellation-desktop">
+ <FeatureConstellation expanded />
+ </div>
+ <div class="tour-constellation-mobile">
+ <FeatureConstellation />
+ </div>
</section>
<section
@@ -145,6 +151,10 @@ export function RouteTour() {
/>
<DemoBookingEmbed id="tour-booking" />
</section>
+
+ <footer class="tour-footer">
+ <HomepageTrustBadges />
+ </footer>
</div>
</div>
</FeaturePage>
diff --git a/apps/marketing/src/features/marketing/views/sales-page.css b/apps/marketing/src/features/marketing/views/sales-page.css
index b2e267b820..8f740b1fd1 100644
--- a/apps/marketing/src/features/marketing/views/sales-page.css
+++ b/apps/marketing/src/features/marketing/views/sales-page.css
@@ -4,14 +4,14 @@
/* The homepage hero and constellation sit in OnboardingShell, which uses the
site's system font stack; .homepage-sections and .feature-page would
otherwise give them slab and Inter. */
-.tour-hero, .tour-constellation .feature-flow, .tour-page .unification-subtext { font-family: -apple-system, BlinkMacSystemFont, "Inter Variable", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; }
+.tour-hero, .tour-constellation .feature-flow, .tour-page .unification-subtext, .tour-footer { font-family: -apple-system, BlinkMacSystemFont, "Inter Variable", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; }
.feature-page .tour-cta { color: #000; }
/* Pull the CTA up to the subtitle: 16px instead of the homepage's 36px
(24px row gap + 12px margin from homepage-scroll-cue.css). */
.tour-hero .ob-welcome:has(.homepage-hero-cta) > [data-welcome-copy] > .homepage-hero-action { margin-top: -8px; }
-/* The shared header's "Talk to us" link leaves the page for cal.com; here the
- booker is inline, so hide it while this page is mounted. */
-body:has(.tour-page) .site-nav-demo { display: none; }
+/* The shared header's "Talk to us" and "Open app" buttons lead off the page;
+ the booker is inline here, so hide them while this page is mounted. */
+body:has(.tour-page) .site-header-actions { display: none; }
/* The desktop line break orphans a word on phones; balance the lines instead. */
@media (max-width: 767px) { .tour-hero h1 { text-wrap: balance; } .tour-hero h1 br { display: none; } }
/* `.feature-page p` also cancels the hero subtitle's `mx-auto` centering. */
@@ -25,8 +25,10 @@ body:has(.tour-page) .site-nav-demo { display: none; }
/* Here the heading leads into the constellation rather than following it. */
.tour-constellation .unification-copy { margin: 0 auto 32px; }
.tour-constellation .feature-flow-expanded { margin-bottom: 0; }
-/* OnboardingShell's hero frame: a centered card in the first viewport. */
-.tour-hero { display: flex; align-items: center; justify-content: center; min-height: 100svh; padding: 96px 0 40px; }
+/* OnboardingShell's hero frame, sized to its content (not the full first
+ viewport) so "Replace 27+ apps" follows "Book a demo" 64px below. */
+.tour-hero { display: flex; align-items: center; justify-content: center; padding: 96px 0 0; }
+.homepage-unification.tour-constellation { padding-top: 56px; }
/* OnboardingShell's tile entrance, which also centers each logo on its point. */
@keyframes tour-orbit-in { from { opacity: 0; transform: translate(-50%, -40%) scale(.8); } to { opacity: 1; transform: translate(-50%, -50%) scale(1); } }
.tour-hero .ob-orbit-tile { animation: tour-orbit-in 900ms cubic-bezier(.22,1,.36,1) both; }
@@ -37,3 +39,34 @@ body:has(.tour-page) .site-nav-demo { display: none; }
.tour-section { scroll-margin-top: 80px; }
.tour-booking { display: flex; flex-direction: column; align-items: center; padding-bottom: 0; }
.sales-booking-embed { width: 100%; max-width: 760px; min-height: 560px; overflow: hidden; border-radius: 24px; background: var(--color-panel); }
+/* The full 15-feature grid on desktop, the compact ring on phones. */
+.tour-constellation-mobile { display: none; }
+@media (max-width: 767px) {
+ .tour-constellation-desktop { display: none; }
+ .tour-constellation-mobile { display: block; }
+}
+/* Phones: a true circle. FeatureConstellation's inline left/top put the eight
+ features on hand-tuned points in a wide box, with the core at 48%/46%; here a
+ square box, a centered core, and one feature every 45 degrees (radius 36%). */
+@media (max-width: 767px) {
+ /* Nearly full screen width (the section's own inset would squeeze it), with
+ icons and core sized to the ring so labels clear their neighbors. */
+ .tour-constellation-mobile { --ring: min(100vw - 32px, 360px); display: flex; justify-content: center; }
+ .tour-constellation-mobile .feature-flow { flex: none; width: var(--ring); height: var(--ring); margin-bottom: 40px; }
+ .tour-constellation-mobile .feature-flow-core { left: 50%; top: 50%; width: calc(var(--ring) * .2); height: calc(var(--ring) * .2); }
+ .tour-constellation-mobile .feature-flow-core svg { width: 48%; height: 48%; }
+ .tour-constellation-mobile .feature-flow-icon { width: calc(var(--ring) * .13); height: calc(var(--ring) * .13); }
+ .tour-constellation-mobile .feature-flow-icon svg { width: 44%; height: 44%; }
+ .tour-constellation-mobile .feature-flow-node > span { top: calc(100% + 6px); font-size: 11px; }
+ .tour-constellation-mobile [data-tool-tile=Google], .tour-constellation-mobile .feature-flow-halo:nth-child(1) { left: 14.0% !important; top: 50.0% !important; }
+ .tour-constellation-mobile [data-tool-tile=Slack], .tour-constellation-mobile .feature-flow-halo:nth-child(2) { left: 24.54% !important; top: 24.54% !important; }
+ .tour-constellation-mobile [data-tool-tile=Sheets], .tour-constellation-mobile .feature-flow-halo:nth-child(3) { left: 50.0% !important; top: 14.0% !important; }
+ .tour-constellation-mobile [data-tool-tile=Notion], .tour-constellation-mobile .feature-flow-halo:nth-child(4) { left: 75.46% !important; top: 24.54% !important; }
+ .tour-constellation-mobile [data-tool-tile=Linear], .tour-constellation-mobile .feature-flow-halo:nth-child(5) { left: 86.0% !important; top: 50.0% !important; }
+ .tour-constellation-mobile [data-tool-tile=HubSpot], .tour-constellation-mobile .feature-flow-halo:nth-child(6) { left: 75.46% !important; top: 75.46% !important; }
+ .tour-constellation-mobile [data-tool-tile=GitHub], .tour-constellation-mobile .feature-flow-halo:nth-child(7) { left: 50.0% !important; top: 86.0% !important; }
+ .tour-constellation-mobile [data-tool-tile=Zoom], .tour-constellation-mobile .feature-flow-halo:nth-child(8) { left: 24.54% !important; top: 75.46% !important; }
+}
+/* The homepage's a16z and security badges close the page. */
+.tour-footer { padding: 72px 0 96px; }
+.tour-footer .homepage-open-source-badges { margin: 0; }