Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore(studio): basic branching UI improvements (#42060)

Danny White526337f1bdba
diff --git a/apps/studio/components/interfaces/BranchManagement/EmptyStates.tsx b/apps/studio/components/interfaces/BranchManagement/EmptyStates.tsx
index 7166def9ca2..460fa467487 100644
--- a/apps/studio/components/interfaces/BranchManagement/EmptyStates.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/EmptyStates.tsx
@@ -7,7 +7,7 @@ import { DocsButton } from 'components/ui/DocsButton'
import { DOCS_URL } from 'lib/constants'
import { Button } from 'ui'
-const EMPTY_STATE_CONTAINER = 'flex items-center flex-col justify-center w-full py-10 px-4'
+const EMPTY_STATE_CONTAINER = 'flex items-center flex-col gap-0.5 justify-center w-full py-10 px-4'
export const PullRequestsEmptyState = ({
url,
@@ -29,7 +29,7 @@ export const PullRequestsEmptyState = ({
return (
<div className={EMPTY_STATE_CONTAINER}>
<p>No merge requests</p>
- <p className="text-foreground-light text-center">
+ <p className="text-foreground-lighter text-center text-balance">
Create your first merge request to merge changes back to the main branch
</p>
<div className="flex items-center space-x-2 mt-4">
@@ -65,14 +65,14 @@ export const PreviewBranchesEmptyState = ({
return (
<div className={EMPTY_STATE_CONTAINER}>
<p>Create your first preview branch</p>
- <p className="text-foreground-light text-center mb-4">
+ <p className="text-foreground-lighter text-center text-balance mb-4">
Preview branches are short-lived environments that let you safely experiment with changes to
your database schema without affecting your main database.
</p>
<div className="flex items-center space-x-2">
<DocsButton href={`${DOCS_URL}/guides/platform/branching`} />
<Button type="primary" onClick={() => onSelectCreateBranch()}>
- Create your first branch
+ Create branch
</Button>
</div>
</div>
diff --git a/apps/studio/components/interfaces/BranchManagement/Overview.tsx b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
index 3fa46a5e86d..4202e209fb5 100644
--- a/apps/studio/components/interfaces/BranchManagement/Overview.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
@@ -118,9 +118,9 @@ export const Overview = ({
IS_PLATFORM &&
persistentBranches.length === 0 && (
<div className="px-6 py-10 flex items-center justify-between">
- <div className="flex flex-col gap-1">
+ <div className="flex flex-col gap-0.5">
<p className="text-sm">Upgrade to unlock persistent branches</p>
- <p className="text-sm text-foreground-light">
+ <p className="text-sm text-foreground-lighter text-balance">
Persistent branches are long-lived, cannot be reset, and are ideal for staging
environments.
</p>
@@ -136,9 +136,9 @@ export const Overview = ({
!isLoadingEntitlement &&
hasAccessToPersistentBranching &&
persistentBranches.length === 0 && (
- <div className="flex items-center flex-col justify-center w-full py-10">
+ <div className="flex items-center flex-col gap-0.5 justify-center w-full py-10">
<p>No persistent branches</p>
- <p className="text-foreground-light text-center">
+ <p className="text-foreground-lighter text-center text-balance">
Persistent branches are long-lived, cannot be reset, and are ideal for staging
environments.
</p>
@@ -196,8 +196,8 @@ export const Overview = ({
<BranchManagementSection header="Scheduled for deletion branches">
{isLoading && <BranchLoader />}
{isSuccess && scheduledForDeletionBranches.length === 0 && (
- <div className="flex items-center flex-col justify-center w-full py-10">
- <p>No scheduled for deletion branches</p>
+ <div className="flex items-center flex-col gap-0.5 justify-center w-full py-10">
+ <p className="text-foreground-lighter">No branches scheduled for deletion</p>
</div>
)}
{isSuccess &&
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubStatus.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubStatus.tsx
index 16f62eb9f5e..f14fa572b86 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubStatus.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubStatus.tsx
@@ -44,10 +44,10 @@ export const GitHubStatus = () => {
className="block w-full transition truncate text-sm text-foreground-light hover:text-foreground"
>
<div className="w-full flex items-center justify-between">
- <h3 className="">GitHub Integration</h3>
+ <h3 className="text-sm">GitHub Integration</h3>
<ArrowUpRight strokeWidth={1} className="h-4 w-4" />
</div>
- <p className="mt-1 text-xs text-foreground-lighter flex items-center gap-2">
+ <p className="mt-0.5 text-xs text-foreground-lighter flex items-center gap-2">
{isConnected ? (
<>
<Image
diff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsx
index 5e11086f673..79246462838 100644
--- a/apps/studio/pages/project/[ref]/branches/index.tsx
+++ b/apps/studio/pages/project/[ref]/branches/index.tsx
@@ -230,7 +230,7 @@ BranchesPage.getLayout = (page) => {
rel="noreferrer"
href="https://github.com/orgs/supabase/discussions/18937"
>
- Branching Feedback
+ Branching feedback
</a>
</Button>
<DocsButton href={`${DOCS_URL}/guides/platform/branching`} />
diff --git a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
index 199677704c2..73facef98f3 100644
--- a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
+++ b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
@@ -390,7 +390,7 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {
rel="noreferrer"
href="https://github.com/orgs/supabase/discussions/18937"
>
- Branching Feedback
+ Branching feedback
</a>
</Button>
<DocsButton href={`${DOCS_URL}/guides/platform/branching`} />