Skip to content

fix: stop text from overflowing on delete org button #16549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 14, 2025
+7 −45
Merged

fix: stop text from overflowing on delete org button #16549

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2dcde96
chore: convert styles to tailwind
brettkolodny Feb 12, 2025
a859e81
fix: match colors closer to original designs
brettkolodny Feb 12, 2025
02a7589
fix: set min width on button to stop overflow
brettkolodny Feb 12, 2025
44d9fbf
fix: format
brettkolodny Feb 12, 2025
d90e20d
fix: remove unused classes
brettkolodny Feb 12, 2025
8d57a44
Merge branch 'main' into brett/fix-text-overflow-on-delete-button
brettkolodny Feb 14, 2025
5171653
fix: remove hard coded tailwind values
brettkolodny Feb 14, 2025
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
52 changes: 7 additions & 45 deletions site/src/pages/OrganizationSettingsPage/OrganizationSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,18 @@ export const OrganizationSettingsPageView: FC<
</HorizontalForm>

{!organization.is_default && (
<HorizontalContainer css={{ marginTop: 48 }}>
<HorizontalContainer className="mt-12">
<HorizontalSection
title="Settings"
description="Change or delete your organization."
>
<div css={styles.dangerSettings}>
<div className="flex bg-surface-orange items-center justify-between border border-solid border-orange-600 rounded-md p-3 pl-4 gap-2 flex-grow">
<span>Deleting an organization is irreversible.</span>
<Button variant="destructive" onClick={() => setIsDeleting(true)}>
<Button
variant="destructive"
onClick={() => setIsDeleting(true)}
className="min-w-fit"
>
Delete this organization
</Button>
</div>
Expand All @@ -151,45 +155,3 @@ export const OrganizationSettingsPageView: FC<
</div>
);
};

const styles = {
dangerSettings: (theme) => ({
display: "flex",
backgroundColor: theme.roles.danger.background,
alignItems: "center",
justifyContent: "space-between",
border: `1px solid ${theme.roles.danger.outline}`,
borderRadius: 8,
padding: 12,
paddingLeft: 18,
gap: 8,
lineHeight: "18px",
flexGrow: 1,

"& .option": {
color: theme.roles.danger.fill.solid,
"&.Mui-checked": {
color: theme.roles.danger.fill.solid,
},
},

"& .info": {
fontSize: 14,
fontWeight: 600,
color: theme.roles.danger.text,
},
}),
dangerButton: (theme) => ({
borderColor: theme.roles.danger.outline,
color: theme.roles.danger.text,

"&.MuiLoadingButton-loading": {
color: theme.roles.danger.disabled.text,
},

"&:hover:not(:disabled)": {
backgroundColor: theme.roles.danger.hover.background,
borderColor: theme.roles.danger.hover.fill.outline,
},
}),
} satisfies Record<string, Interpolation<Theme>>;
Loading