Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/components/members/MemberList.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const ProfileImage = styled.div`
height: 36px;
border-radius: 50%;
background-color: ${colors.grey['400']};
border: 1px solid #888;
flex-shrink: 0;
`;

Expand All @@ -65,13 +66,13 @@ export const MemberName = styled.div`
export const MemberRole = styled.div<{ roleType?: string }>`
color: ${({ roleType }) => {
if (!roleType) return semanticColors.text.point.green;

const role = roleType.toLowerCase();

if (role.includes('예술') || role.includes('art')) {
return semanticColors.text.character.pink;
}
if (role.includes('문학') || role.includes('literature')) {
if (role.includes('인문') || role.includes('humanities') || role.includes('철학')) {
return semanticColors.text.character.mint;
}
if (role.includes('사회') || role.includes('sociology')) {
Expand All @@ -83,7 +84,7 @@ export const MemberRole = styled.div<{ roleType?: string }>`
if (role.includes('과학') || role.includes('science')) {
return semanticColors.text.character.lavender;
}

return semanticColors.text.point.green;
}};
font-size: ${typography.fontSize.xs};
Expand Down
1 change: 1 addition & 0 deletions src/components/members/MemberList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const ProfileImageWithSrc = styled.img`
height: 36px;
border-radius: 50%;
background-color: var(--color-grey-400);
border: 1px solid #888;
flex-shrink: 0;
object-fit: cover;
`;
Expand Down
2 changes: 1 addition & 1 deletion src/components/memory/RecordItem/RecordItem.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { colors, typography, semanticColors } from '../../../styles/global/globa

export const Container = styled.div<{ shouldBlur?: boolean }>`
background-color: none;
filter: ${({ shouldBlur }) => (shouldBlur ? 'blur(2px)' : 'none')};
filter: ${({ shouldBlur }) => (shouldBlur ? 'blur(3px)' : 'none')};
transition: filter 0.3s ease;
position: relative;
`;
Expand Down