Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4a3239a
feat(webapp): move Integrations settings onto the shared settings layout
samejr Jul 26, 2026
9f412cc
chore(webapp): tighten build settings copy
samejr Jul 26, 2026
dd0845b
feat(webapp): add a tinted warning button variant
samejr Jul 26, 2026
628e483
feat(webapp): end-aligned settings rows, and rows that point at their…
samejr Jul 26, 2026
d640593
feat(webapp): move Vercel integration settings onto the settings layout
samejr Jul 26, 2026
688de8b
fix(webapp): even out the vertical padding on settings rows
samejr Jul 26, 2026
1137138
chore(webapp): add a healthy-state mode to the temporary integrations…
samejr Jul 26, 2026
365dd69
chore(webapp): show all integration states in the temporary preview a…
samejr Jul 26, 2026
eae6a1e
refactor(webapp): move SettingsAlertRow into the settings layout prim…
samejr Jul 26, 2026
b007161
feat(webapp): larger, brighter selects in the connect GitHub reposito…
samejr Jul 26, 2026
1572655
chore(webapp): let the temporary preview open the Vercel onboarding m…
samejr Jul 26, 2026
6977dc0
feat(webapp): tidy up the integration setup modals
samejr Jul 26, 2026
2a4051a
fix(webapp): align a select filter field with the options below it
samejr Jul 26, 2026
55daf2e
chore(webapp): remove the temporary integrations settings preview
samejr Jul 26, 2026
46c3a88
fix(webapp): keep preview deployments enabled when the plan gates it
samejr Jul 26, 2026
0d2df4b
Merge remote-tracking branch 'origin/main' into samejr/Settings-page-…
samejr Jul 26, 2026
230aafe
fix(webapp): gate the disable auto-assign button on Vercel permission
samejr Jul 26, 2026
dc47899
fix(webapp): let the connected GitHub repo rows size properly in the …
samejr Jul 26, 2026
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
34 changes: 34 additions & 0 deletions apps/webapp/app/assets/icons/PadlockRoundedIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
export function PadlockRoundedIcon({ className }: { className?: string }) {
return (
<svg
className={className}
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5 12C5 10.8954 5.89543 10 7 10H17C18.1046 10 19 10.8954 19 12V19C19 20.1046 18.1046 21 17 21H7C5.89543 21 5 20.1046 5 19V12Z"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M16 9.5V7C16 4.79086 14.2091 3 12 3C9.79086 3 8 4.79086 8 7V9.5"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M12 14V17"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
}
14 changes: 6 additions & 8 deletions apps/webapp/app/components/BlankStatePanels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -701,14 +701,12 @@ function DeploymentOnboardingSteps() {
Deploy automatically with every push. Read the{" "}
<TextLink to={docsPath("github-integration")}>full guide</TextLink>.
</Paragraph>
<div className="w-fit">
<GitHubSettingsPanel
organizationSlug={organization.slug}
projectSlug={project.slug}
environmentSlug={environment.slug}
billingPath={v3BillingPath({ slug: organization.slug })}
/>
</div>
<GitHubSettingsPanel
organizationSlug={organization.slug}
projectSlug={project.slug}
environmentSlug={environment.slug}
billingPath={v3BillingPath({ slug: organization.slug })}
/>
</StepContentContainer>
</ClientTabsContent>
<ClientTabsContent value={"cli"}>
Expand Down
Loading