fix: Improve dark mode styling

fix: Improve user and group list styling
fix: Member list reload when changing permissions, closes #1999
This commit is contained in:
Tom Moor
2021-03-31 20:57:30 -07:00
parent 2ef0caba88
commit 810257bcf5
10 changed files with 47 additions and 24 deletions

View File

@@ -49,7 +49,8 @@ const CollectionGroupMemberListItem = ({
}
onChange={(ev) => onUpdate(ev.target.value)}
labelHidden
/>{" "}
/>
<Spacer />
<CollectionGroupMemberMenu
onMembers={openMembersModal}
onRemove={onRemove}
@@ -60,10 +61,18 @@ const CollectionGroupMemberListItem = ({
);
};
const Spacer = styled.div`
width: 8px;
`;
const Select = styled(InputSelect)`
margin: 0;
font-size: 14px;
border-color: transparent;
select {
margin: 0;
}
`;
export default CollectionGroupMemberListItem;

View File

@@ -56,23 +56,29 @@ const MemberListItem = ({
{user.isAdmin && <Badge primary={user.isAdmin}>{t("Admin")}</Badge>}
</>
}
image={<Avatar src={user.avatarUrl} size={40} />}
image={<Avatar src={user.avatarUrl} size={32} />}
actions={
<Flex align="center">
{canEdit && onUpdate && (
{onUpdate && (
<Select
label={t("Permissions")}
options={PERMISSIONS}
value={membership ? membership.permission : undefined}
onChange={(ev) => onUpdate(ev.target.value)}
disabled={!canEdit}
labelHidden
/>
)}{" "}
{canEdit && onRemove && <MemberMenu onRemove={onRemove} />}
{canEdit && onAdd && (
<Button onClick={onAdd} neutral>
{t("Add")}
</Button>
)}
{canEdit && (
<>
<Spacer />
{onRemove && <MemberMenu onRemove={onRemove} />}
{onAdd && (
<Button onClick={onAdd} neutral>
{t("Add")}
</Button>
)}
</>
)}
</Flex>
}
@@ -80,10 +86,18 @@ const MemberListItem = ({
);
};
const Spacer = styled.div`
width: 8px;
`;
const Select = styled(InputSelect)`
margin: 0;
font-size: 14px;
border-color: transparent;
select {
margin: 0;
}
`;
export default MemberListItem;

View File

@@ -21,7 +21,7 @@ const UserListItem = ({ user, onAdd, canEdit }: Props) => {
return (
<ListItem
title={user.name}
image={<Avatar src={user.avatarUrl} size={40} />}
image={<Avatar src={user.avatarUrl} size={32} />}
subtitle={
<>
{user.lastActiveAt ? (