Skip to content

Commit 41653c3

Browse files
committed
Merge branch 'wip/next-visual-2' into wip/platform-org-wiring
2 parents b113ffe + 74401c4 commit 41653c3

22 files changed

Lines changed: 141 additions & 52 deletions

File tree

‎apps/sim/platform/design-system/components/field/field.module.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
padding-inline: var(--spacing-8);
3636
background: transparent;
3737
color: inherit;
38+
text-overflow: ellipsis;
3839
}
3940

4041
.input::placeholder {

‎apps/sim/platform/design-system/components/modal/modal-parts.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ export function ModalBody({ children, label, inactive, onInput }: ModalBodyProps
5656
}
5757

5858
interface ModalFooterProps {
59-
confirmLabel: string
59+
/** Absent for a dialog whose rows act on their own, which only closes. */
60+
confirmLabel?: string
6061
onPrevious?: () => void
6162
cancelLabel?: string
6263
destructive?: boolean
@@ -84,9 +85,11 @@ export function ModalFooter({
8485
<Button variant='quiet' disabled={cancelDisabled} onClick={onPrevious}>
8586
{cancelLabel}
8687
</Button>
87-
<Button variant={destructive ? 'destructive' : 'primary'} submit disabled={disabled}>
88-
{confirmLabel}
89-
</Button>
88+
{confirmLabel && (
89+
<Button variant={destructive ? 'destructive' : 'primary'} submit disabled={disabled}>
90+
{confirmLabel}
91+
</Button>
92+
)}
9093
</footer>
9194
)
9295
}

‎apps/sim/platform/design-system/components/modal/modal.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ type ConfirmHandler<Args extends unknown[]> = (...args: Args) => unknown
2626

2727
interface ModalActions {
2828
title: string
29-
confirmLabel: string
29+
/** Absent for a dialog whose rows act on their own, which only closes. */
30+
confirmLabel?: string
3031
confirmDisabled?: boolean
3132
onConfirm?: ConfirmHandler<[values: FormData]>
3233
/** Names the dialog more specifically than its visible title. */

‎apps/sim/platform/design-system/styles/embedded.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
background: var(--ui-canvas);
5252
}
5353

54+
/* A phone has no sidebar toolbar for a page's first row to line up with, only the bar above it. */
55+
@media (max-width: 48rem) {
56+
[data-platform-ui] {
57+
--shell-home-row-start: var(--ui-product-section-gap);
58+
}
59+
}
60+
5461
[data-platform-ui][data-theme="dark"] {
5562
color-scheme: dark;
5663
}

‎apps/sim/platform/embedded/app/(shell)/_components/conversation/conversation.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
display: flex;
131131
flex-direction: column;
132132
align-items: center;
133-
padding: var(--design-spacing-132) var(--design-spacing-12) var(--design-spacing-32);
133+
padding: var(--design-spacing-132) var(--design-spacing-16) var(--design-spacing-32);
134134
}
135135
.landing > [data-platform-ui] {
136136
max-inline-size: 100%;

‎apps/sim/platform/embedded/app/(shell)/_components/route-status/route-status.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
display: flex;
2323
flex-wrap: wrap;
2424
justify-content: center;
25-
gap: var(--ui-action-gap);
25+
gap: var(--spacing-8);
2626
}

‎apps/sim/platform/embedded/app/(shell)/_components/settings-navigation/settings-navigation.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use client'
22

3-
import { useState } from 'react'
3+
import { useEffect, useRef, useState } from 'react'
44
import { useRouter } from 'next/navigation'
55
import { SettingsIntentLink } from '@/components/settings/settings-intent-link'
66
import { usePendingSettingsSelection } from '@/components/settings/use-pending-settings-selection'
@@ -104,12 +104,18 @@ export function SettingsNavigation({ collapsed }: SettingsNavigationProps) {
104104
navigation.activeSection
105105
)
106106
const [query, setQuery] = useState('')
107+
const nav = useRef<HTMLElement>(null)
108+
// A section low in the list opens scrolled off a short window, and the current row should show.
109+
useEffect(() => {
110+
nav.current?.querySelector('[aria-current="page"]')?.scrollIntoView({ block: 'nearest' })
111+
}, [selected])
107112
const searching = !collapsed && query.trim().length > 0
108113
const found = searching ? searchSettings(query, groups, navigation) : []
109114
const count = found.reduce((total, group) => total + group.results.length, 0)
110115

111116
return (
112117
<nav
118+
ref={nav}
113119
aria-label='Settings'
114120
className={styles.navigation}
115121
data-collapsed={collapsed || undefined}

‎apps/sim/platform/embedded/app/(shell)/home/_components/activity-list/activity-list.module.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
max-block-size: var(--ui-widget-max-size);
1111
margin-inline: calc(-1 * var(--ui-row-inset));
1212
}
13+
/* The divider stops with the text, where the row's hover fill reaches past it. */
1314
.entries > * + * {
15+
position: relative;
16+
}
17+
.entries > * + *::before {
18+
position: absolute;
19+
inset-block-start: 0;
20+
inset-inline: var(--ui-row-inset);
1421
border-block-start: var(--spacing-stroke-default) solid var(--ui-divider);
22+
content: "";
1523
}

‎apps/sim/platform/embedded/app/(shell)/home/_components/calendar/calendar-day.module.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@
5252
block-size: var(--spacing-stroke-default);
5353
background: var(--ui-divider);
5454
}
55+
/* Above the now line, which would otherwise rule through a short card's title. */
5556
.event,
5657
.overflow {
58+
z-index: 2;
5759
grid-column: 2;
5860
min-inline-size: 0;
5961
margin-block: calc(var(--spacing-4) / 2);

‎apps/sim/platform/embedded/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
margin-inline: auto;
1818
padding-block: var(--design-spacing-64) var(--design-spacing-24);
1919
}
20+
@media (max-width: 48rem) {
21+
.dashboard {
22+
padding-block-start: var(--design-spacing-24);
23+
}
24+
}
2025
/* Customize Home's menu opens over the composer, whose own stacking stays within its row. */
2126
.dashboard > :first-child {
2227
position: relative;

0 commit comments

Comments
 (0)