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(web): use one placeholder token for every text input (#5308)

Aidan Holloway-Bidwell2697fac46d4d
diff --git a/apps/web/src/features/block-automation/component/automationUtils.ts b/apps/web/src/features/block-automation/component/automationUtils.ts
index 4bc8a61848..811fd83a2b 100644
--- a/apps/web/src/features/block-automation/component/automationUtils.ts
+++ b/apps/web/src/features/block-automation/component/automationUtils.ts
@@ -11,7 +11,7 @@ import type {
import type { ScheduleDraft, ScheduleFrequency } from './types';
export const INPUT_CLASS =
- 'w-full border border-edge-muted rounded-sm bg-surface px-2 py-1.5 text-sm text-ink outline-none placeholder:text-ink/30 focus:border-accent/20 cursor-default';
+ 'w-full border border-edge-muted rounded-sm bg-surface px-2 py-1.5 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent/20 cursor-default';
export const DEFAULT_TIME = '09:00';
export const FREQUENCY_OPTIONS: Array<{
diff --git a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
index 49e4bde067..8122c24aff 100644
--- a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
+++ b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
@@ -95,7 +95,7 @@ export function CodeFileTypeChip() {
ref={searchRef}
type="text"
placeholder="Search..."
- class="w-full bg-transparent text-xs outline-none placeholder:text-ink-extra-muted"
+ class="w-full bg-transparent text-xs outline-none placeholder:text-ink-placeholder"
value={search()}
onInput={(e) => setSearch(e.currentTarget.value)}
onKeyDown={(e) => {
diff --git a/apps/web/src/features/block-pdf/component/PageNumberInput.tsx b/apps/web/src/features/block-pdf/component/PageNumberInput.tsx
index 4bc5c3731e..ccd0c78256 100644
--- a/apps/web/src/features/block-pdf/component/PageNumberInput.tsx
+++ b/apps/web/src/features/block-pdf/component/PageNumberInput.tsx
@@ -67,7 +67,7 @@ export function PageNumberInput() {
<div class="cursor-default">
<input
class={cn(
- 'rounded-md border border-edge-muted bg-transparent px-2 text-sm text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent',
+ 'rounded-md border border-edge-muted bg-transparent px-2 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent',
'font-medium cursor-default text-center',
getWidthClass(currentPageNumber())
)}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx
index da493b9c25..e0ae879874 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx
@@ -566,7 +566,7 @@ export const MobileFilterDrawer = () => {
setAssigneeSearch(e.currentTarget.value)
}
placeholder="Search assignees..."
- class="flex-1 bg-transparent text-sm outline-none placeholder:text-ink-muted"
+ class="flex-1 bg-transparent text-sm outline-none placeholder:text-ink-placeholder"
/>
</div>
<div class="max-h-[calc(50*var(--dvh))] overflow-y-auto scrollbar-hidden">
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
index beb5ec07b4..b3b65550c4 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/searchable-multi-select.tsx
@@ -279,7 +279,7 @@ export const SearchableMultiSelect = (props: SearchableMultiSelectProps) => {
<div class="flex items-center gap-2 px-3 py-2 border-b border-edge-muted">
<SearchIcon class="size-3.5 text-ink-muted shrink-0" />
<Combobox.Input
- class="flex-1 min-w-0 text-sm bg-transparent outline-none caret-accent placeholder:text-ink-faint"
+ class="flex-1 min-w-0 text-sm bg-transparent outline-none caret-accent placeholder:text-ink-placeholder"
placeholder={props.placeholder ?? 'Search...'}
/>
</div>
@@ -404,7 +404,7 @@ export const SearchableMultiSelectInline = (
<Combobox.Input
ref={props.inputRef}
onKeyDown={handleInputKeyDown}
- class="flex-1 min-w-0 text-sm bg-transparent outline-none caret-accent placeholder:text-ink-faint"
+ class="flex-1 min-w-0 text-sm bg-transparent outline-none caret-accent placeholder:text-ink-placeholder"
placeholder={props.placeholder ?? 'Search...'}
/>
</div>
diff --git a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
index dd0b09680b..9e8bbc7027 100644
--- a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
@@ -277,7 +277,7 @@ export function CompanyViewsMenu() {
placeholder="View name"
class={cn(
'w-full rounded-md border border-edge-muted bg-transparent px-2 py-1 text-sm',
- 'outline-none focus:border-accent placeholder:text-ink-faint'
+ 'outline-none focus:border-accent placeholder:text-ink-placeholder'
)}
/>
<div class="flex items-center justify-between gap-1.5">
diff --git a/apps/web/src/features/onboarding/MobileWebWelcome.tsx b/apps/web/src/features/onboarding/MobileWebWelcome.tsx
index 21575abef4..c140fe31e1 100644
--- a/apps/web/src/features/onboarding/MobileWebWelcome.tsx
+++ b/apps/web/src/features/onboarding/MobileWebWelcome.tsx
@@ -57,7 +57,7 @@ export default function MobileWebWelcome(props: MobileWebWelcomeProps) {
placeholder="[email protected]"
value={email()}
onInput={(e) => setEmail(e.currentTarget.value)}
- class="w-full px-3 py-2.5 text-base border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none focus:border-accent"
+ class="w-full px-3 py-2.5 text-base border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink-placeholder outline-none focus:border-accent"
/>
<button
type="submit"
diff --git a/apps/web/src/features/property/tags/TagEditorDialog.tsx b/apps/web/src/features/property/tags/TagEditorDialog.tsx
index 01cea81791..de45fbfe16 100644
--- a/apps/web/src/features/property/tags/TagEditorDialog.tsx
+++ b/apps/web/src/features/property/tags/TagEditorDialog.tsx
@@ -216,7 +216,7 @@ export function TagEditorDialog(props: {
onKeyDown={(event) => {
if (event.key === 'Enter' && canSubmit()) submit();
}}
- class="h-9 w-full rounded-md border border-edge-muted bg-surface px-3 text-sm text-ink outline-none placeholder:text-ink/30 focus:border-accent"
+ class="h-9 w-full rounded-md border border-edge-muted bg-surface px-3 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
placeholder="Tag name"
/>
</EditorRow>
diff --git a/apps/web/src/features/settings/Account.tsx b/apps/web/src/features/settings/Account.tsx
index b1f06fcf79..a462af232c 100644
--- a/apps/web/src/features/settings/Account.tsx
+++ b/apps/web/src/features/settings/Account.tsx
@@ -587,7 +587,7 @@ function NameInput(props: {
<div class="ph-no-capture group relative flex items-center gap-1.5 rounded-lg h-9 px-3 border text-sm bg-transparent text-ink-muted border-edge-muted hover:text-ink focus-within:text-ink focus-within:border-accent">
<input
type="text"
- class="flex-1 min-w-0 bg-transparent outline-none border-0 p-0 text-sm placeholder:text-ink-extra-muted"
+ class="flex-1 min-w-0 bg-transparent outline-none border-0 p-0 text-sm placeholder:text-ink-placeholder"
value={inputValue()}
onInput={(e) => setInputValue(e.currentTarget.value)}
onFocus={() => {
diff --git a/apps/web/src/features/settings/Appearance.tsx b/apps/web/src/features/settings/Appearance.tsx
index b6d941f0ca..3b0c61f8f8 100644
--- a/apps/web/src/features/settings/Appearance.tsx
+++ b/apps/web/src/features/settings/Appearance.tsx
@@ -410,7 +410,7 @@ function InterfaceThemeSelect(props: {
}}
placeholder="Filter themes…"
spellcheck={false}
- class="h-8 w-full rounded-md border border-edge-muted bg-transparent px-2.5 text-sm text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent"
+ class="h-8 w-full rounded-md border border-edge-muted bg-transparent px-2.5 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
/>
</div>
diff --git a/apps/web/src/features/settings/Crm.tsx b/apps/web/src/features/settings/Crm.tsx
index ed50aaec43..ebc968c72f 100644
--- a/apps/web/src/features/settings/Crm.tsx
+++ b/apps/web/src/features/settings/Crm.tsx
@@ -278,7 +278,7 @@ function CrmEnablementSection() {
value={disableConfirmation()}
onInput={(e) => setDisableConfirmation(e.currentTarget.value)}
placeholder={DISABLE_CRM_PHRASE}
- class="w-full px-3 py-2 text-sm border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none focus:border-accent"
+ class="settings-input w-full"
/>
</ConfirmDialog>
</SettingsSection>
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsx
index bc3d52a78c..689871c5a1 100644
--- a/apps/web/src/features/settings/Team.tsx
+++ b/apps/web/src/features/settings/Team.tsx
@@ -161,12 +161,8 @@ function InviteEntryRow(props: {
onInput={(e) => props.onEmailChange(e.currentTarget.value)}
onBlur={() => props.onBlur()}
placeholder="Enter email address"
- class={cn(
- 'flex-1 min-w-0 px-3 py-2 text-sm border rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none',
- props.error
- ? 'border-failure focus:border-failure'
- : 'border-edge-muted focus:border-accent'
- )}
+ class="settings-input flex-1 min-w-0"
+ aria-invalid={!!props.error}
/>
<Show when={props.showRemove}>
<Tooltip label="Remove">
@@ -661,12 +657,8 @@ function CreateTeamDialog(props: { open: boolean; onClose: () => void }) {
onInput={(e) => handleTeamNameChange(e.currentTarget.value)}
onBlur={() => validateTeamName()}
placeholder="My Team"
- class={cn(
- 'w-full px-3 py-2 text-sm border rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none',
- teamNameError()
- ? 'border-failure focus:border-failure'
- : 'border-edge-muted focus:border-accent'
- )}
+ class="settings-input w-full"
+ aria-invalid={!!teamNameError()}
/>
<Show when={teamNameError()}>
<p class="text-xs text-failure-ink">{teamNameError()}</p>
@@ -1354,7 +1346,7 @@ function TeamManagement(props: {
value={memberQuery()}
onInput={(e) => setMemberQuery(e.currentTarget.value)}
placeholder="Filter members"
- class="flex-1 min-w-0 bg-transparent text-sm text-ink outline-none placeholder:text-ink-extra-muted"
+ class="flex-1 min-w-0 bg-transparent text-sm text-ink outline-none placeholder:text-ink-placeholder"
/>
<Show when={memberQuery()}>
<button
@@ -1476,7 +1468,7 @@ function TeamManagement(props: {
value={deleteConfirmation()}
onInput={(e) => setDeleteConfirmation(e.currentTarget.value)}
placeholder={deleteConfirmationPhrase()}
- class="w-full px-3 py-2 text-sm border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none focus:border-accent"
+ class="settings-input w-full"
/>
<div class="flex justify-end gap-1 pt-2">
<Button
diff --git a/apps/web/src/features/team-invitations/invite-modal.tsx b/apps/web/src/features/team-invitations/invite-modal.tsx
index 3d97ff3e48..5886699a03 100644
--- a/apps/web/src/features/team-invitations/invite-modal.tsx
+++ b/apps/web/src/features/team-invitations/invite-modal.tsx
@@ -93,7 +93,7 @@ export const InviteModal = () => {
value={value()}
onInput={(e) => setValue(e.currentTarget.value)}
rows={4}
- class="w-full px-3 py-2 text-sm/relaxed border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink/30 outline-none focus:border-accent resize-none"
+ class="w-full px-3 py-2 text-sm/relaxed border border-edge-muted rounded-lg bg-surface text-ink placeholder:text-ink-placeholder outline-none focus:border-accent resize-none"
/>
</div>
diff --git a/apps/web/src/features/theme/components/ThemeEditor.tsx b/apps/web/src/features/theme/components/ThemeEditor.tsx
index 0af23ecbbe..db9077d996 100644
--- a/apps/web/src/features/theme/components/ThemeEditor.tsx
+++ b/apps/web/src/features/theme/components/ThemeEditor.tsx
@@ -48,7 +48,7 @@ export function ThemeEditor(props: {
spellcheck={false}
placeholder="Theme name"
aria-label="Theme name"
- class="w-40 min-w-0 rounded-md border border-edge-muted bg-transparent px-2 py-1 text-xs text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent"
+ class="w-40 min-w-0 rounded-md border border-edge-muted bg-transparent px-2 py-1 text-xs text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
/>
<div class="flex-1" />
<Button
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 30fcf246b3..b134d4696b 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -565,8 +565,10 @@ a {
Apply to an <input>; pair with a width utility (e.g. `w-full`) as needed. */
@utility settings-input {
@apply h-9 px-3 rounded-lg border border-edge-muted bg-transparent text-sm text-ink outline-none transition-colors;
+ /* Matches the composer/chat placeholder token so hint text reads the same
+ faintness everywhere, rather than settings sitting more prominent. */
&::placeholder {
- @apply text-ink-extra-muted;
+ @apply text-ink-placeholder;
}
&:hover {
@apply border-edge;
diff --git a/apps/web/src/lib/core/component/FindBar.tsx b/apps/web/src/lib/core/component/FindBar.tsx
index b70bde202a..f217320770 100644
--- a/apps/web/src/lib/core/component/FindBar.tsx
+++ b/apps/web/src/lib/core/component/FindBar.tsx
@@ -167,7 +167,7 @@ function FindBarInput(props: { placeholder?: string; autofocus?: boolean }) {
<input
ref={inputEl}
type="text"
- class="min-w-0 flex-1 bg-transparent border-0 px-1 text-sm text-ink placeholder:text-ink-muted focus:outline-none focus:ring-0"
+ class="min-w-0 flex-1 bg-transparent border-0 px-1 text-sm text-ink placeholder:text-ink-placeholder focus:outline-none focus:ring-0"
placeholder={props.placeholder ?? 'Find'}
value={controller.query()}
onInput={(e) => controller.setQuery(e.currentTarget.value)}