Skip to content

Commit 3718a4c

Browse files
committed
Make the default badge live in its column
1 parent ba7181d commit 3718a4c

File tree

2 files changed

+17
-14
lines changed
  • apps/webapp/app
    • components/primitives
    • routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions

2 files changed

+17
-14
lines changed

apps/webapp/app/components/primitives/Badge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const variants = {
77
"extra-small":
88
"grid place-items-center border border-charcoal-650 rounded-sm px-1 h-4 text-xxs bg-background-bright text-blue-500 whitespace-nowrap",
99
small:
10-
"grid place-items-center border border-charcoal-650 rounded-sm px-1.5 h-5 text-xs bg-background-bright text-blue-500 whitespace-nowrap",
10+
"grid place-items-center border border-charcoal-650 rounded-sm px-1 h-5 text-xs bg-background-bright text-blue-500 whitespace-nowrap",
1111
"outline-rounded":
1212
"grid place-items-center rounded-full px-1 h-4 tracking-wider text-xxs border border-blue-500 text-blue-500 uppercase whitespace-nowrap",
1313
rounded:

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,19 +229,21 @@ export default function Page() {
229229
"Not available"
230230
)}
231231
</TableCell>
232-
<TableCellMenu
233-
className="pl-32"
234-
isSticky
235-
visibleButtons={
236-
region.isDefault ? (
237-
<Badge variant="small" className="inline-grid">
238-
Default
239-
</Badge>
240-
) : (
232+
{region.isDefault ? (
233+
<TableCell alignment="right">
234+
<Badge variant="small" className="inline-grid">
235+
Default
236+
</Badge>
237+
</TableCell>
238+
) : (
239+
<TableCellMenu
240+
className="pl-32"
241+
isSticky
242+
visibleButtons={
241243
<SetDefaultDialog regions={regions} newDefaultRegion={region} />
242-
)
243-
}
244-
/>
244+
}
245+
/>
246+
)}
245247
</TableRow>
246248
);
247249
})
@@ -252,6 +254,7 @@ export default function Page() {
252254
</TableCell>
253255
<TableCellMenu
254256
alignment="right"
257+
isSticky
255258
visibleButtons={
256259
<Feedback
257260
button={
@@ -308,7 +311,7 @@ function SetDefaultDialog({
308311
</DialogHeader>
309312
<DialogDescription>
310313
<Paragraph>
311-
Are you sure you want to set {newDefaultRegion.name} as your default region?
314+
Are you sure you want to set {newDefaultRegion.name} as your new default region?
312315
</Paragraph>
313316

314317
<div className="my-4 flex">

0 commit comments

Comments
 (0)