Remove duplicative Toggle component (#3028)

fix: Tidy some styling and spacing issues in settings
This commit is contained in:
Tom Moor
2022-01-28 20:23:02 -08:00
committed by GitHub
parent 1cd770e38d
commit 76d83b5e82
19 changed files with 112 additions and 197 deletions

View File

@@ -54,7 +54,6 @@ const CollectionGroupMemberListItem = ({
labelHidden
nude
/>
<Spacer />
<CollectionGroupMemberMenu
onMembers={openMembersModal}
onRemove={onRemove}
@@ -65,14 +64,12 @@ const CollectionGroupMemberListItem = ({
);
};
const Spacer = styled.div`
width: 8px;
`;
const Select = styled(InputSelect)`
margin: 0;
font-size: 14px;
border-color: transparent;
box-shadow: none;
color: ${(props) => props.theme.textSecondary};
select {
margin: 0;

View File

@@ -14,11 +14,11 @@ import MemberMenu from "~/menus/MemberMenu";
type Props = {
user: User;
membership?: Membership | null | undefined;
membership?: Membership | undefined;
canEdit: boolean;
onAdd?: () => any;
onRemove?: () => any;
onUpdate?: (permission: string) => any;
onAdd?: () => void;
onRemove?: () => void;
onUpdate?: (permission: string) => void;
};
const MemberListItem = ({
@@ -62,7 +62,7 @@ const MemberListItem = ({
}
image={<Avatar src={user.avatarUrl} size={32} />}
actions={
<Flex align="center">
<Flex align="center" gap={8}>
{onUpdate && (
<Select
label={t("Permissions")}
@@ -77,7 +77,6 @@ const MemberListItem = ({
)}
{canEdit && (
<>
<Spacer />
{onRemove && <MemberMenu onRemove={onRemove} />}
{onAdd && (
<Button onClick={onAdd} neutral>
@@ -92,14 +91,12 @@ const MemberListItem = ({
);
};
const Spacer = styled.div`
width: 8px;
`;
const Select = styled(InputSelect)`
margin: 0;
font-size: 14px;
border-color: transparent;
box-shadow: none;
color: ${(props) => props.theme.textSecondary};
select {
margin: 0;

View File

@@ -11,7 +11,7 @@ import Time from "~/components/Time";
type Props = {
user: User;
canEdit: boolean;
onAdd: () => any;
onAdd: () => void;
};
const UserListItem = ({ user, onAdd, canEdit }: Props) => {