diff --git a/app/soapbox/components/groups/group-avatar.tsx b/app/soapbox/components/groups/group-avatar.tsx index 91d6808d2..9b3213bb9 100644 --- a/app/soapbox/components/groups/group-avatar.tsx +++ b/app/soapbox/components/groups/group-avatar.tsx @@ -23,8 +23,9 @@ const GroupAvatar = (props: IGroupAvatar) => { className={ clsx('relative rounded-full', { 'shadow-[0_0_0_2px_theme(colors.primary.600),0_0_0_4px_theme(colors.white)]': isOwner && withRing, + 'dark:shadow-[0_0_0_2px_theme(colors.primary.600),0_0_0_4px_theme(colors.gray.800)]': isOwner && withRing, 'shadow-[0_0_0_2px_theme(colors.primary.600)]': isOwner && !withRing, - 'shadow-[0_0_0_2px_theme(colors.white)]': !isOwner && withRing, + 'shadow-[0_0_0_2px_theme(colors.white)] dark:shadow-[0_0_0_2px_theme(colors.gray.800)]': !isOwner && withRing, }) } src={group.avatar} diff --git a/app/soapbox/components/ui/button/useButtonStyles.ts b/app/soapbox/components/ui/button/useButtonStyles.ts index 1b61fc7b4..740b06ba4 100644 --- a/app/soapbox/components/ui/button/useButtonStyles.ts +++ b/app/soapbox/components/ui/button/useButtonStyles.ts @@ -9,7 +9,7 @@ const themes = { 'bg-transparent border-gray-400 dark:border-gray-800 hover:border-primary-300 dark:hover:border-primary-700 focus:border-primary-500 text-gray-900 dark:text-gray-100 focus:ring-primary-500', accent: 'border-transparent bg-secondary-500 hover:bg-secondary-400 focus:bg-secondary-500 text-gray-100 focus:ring-secondary-300', danger: 'border-transparent bg-danger-100 dark:bg-danger-900 text-danger-600 dark:text-danger-200 hover:bg-danger-600 hover:text-gray-100 dark:hover:text-gray-100 dark:hover:bg-danger-500 focus:ring-danger-500', - transparent: 'border-transparent text-gray-800 backdrop-blur-sm bg-white/75 hover:bg-white/80', + transparent: 'border-transparent bg-transparent text-primary-600 dark:text-accent-blue dark:bg-transparent hover:bg-gray-200 dark:hover:bg-gray-800/50', outline: 'border-gray-100 border-2 bg-transparent text-gray-100 hover:bg-white/10', muted: 'border border-solid bg-transparent border-gray-400 dark:border-gray-800 hover:border-primary-300 dark:hover:border-primary-700 focus:border-primary-500 text-gray-900 dark:text-gray-100 focus:ring-primary-500', }; diff --git a/app/soapbox/components/ui/popover/popover.tsx b/app/soapbox/components/ui/popover/popover.tsx index 7700f8149..7f909f8bc 100644 --- a/app/soapbox/components/ui/popover/popover.tsx +++ b/app/soapbox/components/ui/popover/popover.tsx @@ -13,6 +13,8 @@ import { import clsx from 'clsx'; import React, { useRef, useState } from 'react'; +import Portal from '../portal/portal'; + interface IPopover { children: React.ReactElement> /** The content of the popover */ @@ -83,31 +85,33 @@ const Popover: React.FC = (props) => { })} {(isMounted) && ( -
- {content} + +
+ {content} - -
+ +
+ )} ); diff --git a/app/soapbox/features/group/components/group-relationship.tsx b/app/soapbox/features/group/components/group-relationship.tsx index 771c0a3ee..8fd47ac2d 100644 --- a/app/soapbox/features/group/components/group-relationship.tsx +++ b/app/soapbox/features/group/components/group-relationship.tsx @@ -22,6 +22,7 @@ const GroupRelationship = ({ group }: IGroupRelationship) => { space={1} alignItems='center' data-testid='group-relationship' + className='text-primary-600 dark:text-accent-blue' > { const { groups, isLoading } = usePendingGroups(); - const renderBlankslate = () => ( { {/* Group Cover Image */}
- + {/* Group Avatar */}
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx index 1b71e36c9..7db6d9c20 100644 --- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx +++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx @@ -3,8 +3,10 @@ import { FormattedMessage } from 'react-intl'; import { Avatar, Divider, HStack, Stack, Text, Button } from 'soapbox/components/ui'; +import type { Group } from 'soapbox/schemas'; + interface IConfirmationStep { - group: any + group: Group } const ConfirmationStep: React.FC = ({ group }) => { @@ -53,24 +55,30 @@ const ConfirmationStep: React.FC = ({ group }) => { - + + + - + + + - + + + @@ -96,7 +104,7 @@ interface IInfoListNumber { const InfoListNumber: React.FC = ({ number }) => { return ( -
+
{number}
); @@ -109,9 +117,11 @@ interface IInfoListItem { const InfoListItem: React.FC = ({ number, children }) => { return ( - -
-
{children}
+ + +
+ {children} +
); };