diff --git a/.changeset/nervous-wombats-sin.md b/.changeset/nervous-wombats-sin.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/nervous-wombats-sin.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx index 611700d9d56..d1b14a1db8f 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx @@ -86,7 +86,13 @@ const OrganizationProfileSection = () => { return null; } - const profile = ; + const profile = ( + + ); return ( { title={localizationKeys('organizationProfile.profilePage.domainSection.title')} id='organizationDomains' centered={false} - sx={{ - gap: 0, - }} > @@ -156,9 +159,10 @@ const OrganizationDomainsSection = () => { ({ - paddingLeft: t.space.$5x5, - color: t.colors.$colorTextSecondary, + paddingLeft: t.space.$9, + marginTop: `-${t.space.$1}`, })} + colorScheme='tertiary' /> @@ -188,12 +192,20 @@ const OrganizationLeaveSection = () => { > - + ({ + paddingTop: 0, + paddingBottom: 0, + paddingLeft: t.space.$1, + })} + id='organizationDanger' + > { > - + ({ + paddingTop: 0, + paddingBottom: 0, + paddingLeft: t.space.$1, + })} + id={'organizationDanger'} + > { > - + sx={t => ({ alignItems: 'flex-start', padding: `${t.space.$2} ${t.space.$4}`, - marginLeft: `-${t.space.$4}`, borderRadius: t.radii.$md, ':hover': { backgroundColor: t.colors.$blackAlpha50 }, })} diff --git a/packages/clerk-js/src/ui/elements/Header.tsx b/packages/clerk-js/src/ui/elements/Header.tsx index bd39f7457a7..7644d59a241 100644 --- a/packages/clerk-js/src/ui/elements/Header.tsx +++ b/packages/clerk-js/src/ui/elements/Header.tsx @@ -1,16 +1,17 @@ import React from 'react'; import { Col, descriptors, Heading, Text, useAppearance } from '../customizables'; -import type { PropsOfComponent } from '../styledSystem'; +import type { PropsOfComponent, ThemableCssProp } from '../styledSystem'; import { ApplicationLogo } from './ApplicationLogo'; export type HeaderProps = PropsOfComponent & { showLogo?: boolean; + contentSx?: ThemableCssProp; }; const Root = React.memo( React.forwardRef((props, ref) => { - const { sx, children, showLogo = false, ...rest } = props; + const { sx, children, contentSx, gap = 6, showLogo = false, ...rest } = props; const appearance = useAppearance(); const logoIsVisible = appearance.parsedLayout.logoPlacement === 'inside' && showLogo; @@ -19,12 +20,18 @@ const Root = React.memo( {logoIsVisible && } - {children} + + {children} + ); }), diff --git a/packages/clerk-js/src/ui/elements/Section.tsx b/packages/clerk-js/src/ui/elements/Section.tsx index 73af7a0d3e0..177fc2b3d8f 100644 --- a/packages/clerk-js/src/ui/elements/Section.tsx +++ b/packages/clerk-js/src/ui/elements/Section.tsx @@ -21,7 +21,10 @@ const ProfileSectionRoot = (props: ProfileSectionProps) => { const [height, setHeight] = useState(0); useLayoutEffect(() => { - setHeight(ref.current?.clientHeight || 0); + const element = ref.current; + if (element) { + setHeight(element.clientHeight + element.clientTop || 0); + } }, []); return ( @@ -34,7 +37,7 @@ const ProfileSectionRoot = (props: ProfileSectionProps) => { borderTop: `${t.borders.$normal} ${t.colors.$blackAlpha100}`, paddingTop: t.space.$4, paddingBottom: t.space.$4, - gap: t.space.$4, + gap: t.space.$6, [mqu.lg]: { flexDirection: 'column-reverse', gap: t.space.$2, @@ -49,14 +52,13 @@ const ProfileSectionRoot = (props: ProfileSectionProps) => { elementId={descriptors.profileSectionContent.setId(id)} gap={2} ref={ref} - sx={t => ({ - paddingLeft: t.space.$6, + sx={{ minWidth: 0, width: '100%', '+ *': { '--clerk-height': `${height}px`, }, - })} + }} > {children} @@ -65,7 +67,7 @@ const ProfileSectionRoot = (props: ProfileSectionProps) => { elementDescriptor={descriptors.profileSectionHeader} elementId={descriptors.profileSectionHeader.setId(id)} sx={t => ({ - padding: centered ? undefined : `${t.space.$2} 0`, + padding: centered ? undefined : `${t.space.$1x5} 0`, gap: t.space.$1, width: t.space.$66, alignSelf: height ? 'self-start' : centered ? 'center' : undefined, @@ -126,8 +128,7 @@ const ProfileSectionItem = (props: ProfileSectionItemProps) => { justifyContent: 'space-between', width: '100%', alignItems: 'center', - paddingTop: t.space.$1x5, - paddingBottom: t.space.$1x5, + padding: `${t.space.$1x5} ${t.space.$none} ${t.space.$1x5} ${t.space.$4}`, gap: t.space.$2, }), sx, @@ -179,7 +180,6 @@ const ProfileSectionArrowButton = (props: ProfileSectionButtonProps) => { textWrap: 'nowrap', justifyContent: 'start', height: t.sizes.$8, - marginLeft: `-${t.space.$3x5}`, }), sx, ]}