Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions static/app/views/onboarding/components/scmFeatureCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ export function ScmFeatureCard({
>
<ScmSelectableContainer
isSelected={isSelected}
padding={{xs: 'md', md: 'lg'}}
padding="lg"
height="100%"
borderCompensation={3}
>
<Flex align="start">
<Grid
columns="min-content 1fr"
columns="min-content 1fr min-content"
rows="min-content min-content"
gap={{xs: 'xs md', md: 'xs lg'}}
gap="xs lg"
align="center"
width="100%"
areas={`
"icon label"
". description"
"icon label toggle"
". description ."
`}
>
<Container area="icon">
Expand All @@ -79,31 +79,34 @@ export function ScmFeatureCard({
{label}
</Text>
</Container>
<Container area="description">

<Flex area="toggle" align="start" gap="sm">
{isVolumeLoading ? (
<Placeholder height="22px" width="100px" />
) : (
<Tooltip title={volumeTooltip} delay={100}>
<Tag variant="muted" icon={<IconInfo size="sm" />}>
{volume}
</Tag>
</Tooltip>
)}

<Tooltip title={disabledReason} disabled={!disabledReason} delay={500}>
<Switch
checked={isSelected}
disabled={disabled}
role="presentation"
tabIndex={-1}
readOnly
size="sm"
/>
</Tooltip>
</Flex>

<Container area="description" column="2 / -1">
<Text variant="secondary">{description}</Text>
</Container>
</Grid>
<Flex align="start" gap="sm">
{isVolumeLoading ? (
<Placeholder height="22px" width="100px" />
) : (
<Tooltip title={volumeTooltip} delay={100}>
<Tag variant="muted" icon={<IconInfo size="sm" />}>
{volume}
</Tag>
</Tooltip>
)}
<Tooltip title={disabledReason} disabled={!disabledReason} delay={500}>
<Switch
checked={isSelected}
disabled={disabled}
role="presentation"
tabIndex={-1}
readOnly
size="sm"
/>
</Tooltip>
</Flex>
</Flex>
</ScmSelectableContainer>
</ScmCardButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function ScmFeatureInfoCards({
<Grid
columns="min-content 1fr"
rows="min-content min-content"
gap={{xs: 'xs md', sm: 'xs lg'}}
gap="xs lg"
align="center"
areas={`
"icon label"
Expand Down
7 changes: 5 additions & 2 deletions static/app/views/onboarding/scmConnect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export function ScmConnect({onComplete, genBackButton}: StepProps) {
paddingTop="3xl"
>
<Flex align="center">{genBackButton?.()}</Flex>
<Flex align="center" gap="md">
<Flex align="center" gap="md" minWidth={0}>
{!selectedRepository && (
<Button
analyticsEventKey="onboarding.scm_connect_skip_clicked"
Expand All @@ -194,8 +194,11 @@ export function ScmConnect({onComplete, genBackButton}: StepProps) {
}}
onClick={() => onComplete()}
variant="transparent"
style={{minWidth: 0}}
>
{t('Continue without a repo')}
<Text ellipsis variant="inherit">
{t('Continue without a repo')}
</Text>
</Button>
)}

Expand Down
Loading