Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/components layout #79

Merged
merged 3 commits into from
Jul 20, 2022
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
2 changes: 1 addition & 1 deletion src/assets/icon/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions src/assets/icon/tabbar_center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions src/assets/icon/tabbar_center_selected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icon/tabbar_contents.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 16 additions & 32 deletions src/components/common/badges/SuggestBadge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,29 @@ interface SuggestBadgeProps {

function SuggestBadge({ isSuggesting }: SuggestBadgeProps) {
return (
<Wrapper>
<StyledSpan isSuggesting={isSuggesting}>
{isSuggesting ? '제안중' : '거절됨'}
</StyledSpan>
<Wrapper isSuggesting={isSuggesting}>
{isSuggesting ? '제안중' : '거절됨'}
</Wrapper>
);
}

export default SuggestBadge;

const Wrapper = styled.div`
height: 28px;
`;

const StyledSpan = styled.span<{
isSuggesting: boolean;
}>`
font-weight: 500;
font-size: 12px;
line-height: 28px;
vertical-align: middle;
color: white;

width: 64px;
height: 28px;
const Wrapper = styled.div<{ isSuggesting: boolean }>`
height: 26px;
width: 67px;
border-radius: ${({ theme }) => theme.radius.small};
border: none;
outline: none;

display: inline-block;
text-align: center;
display: flex;
justify-content: center;
align-items: center;

${({ isSuggesting }) =>
${({ theme }) => theme.typo.button.InnerText_T_12_EB}
color: ${({ theme, isSuggesting }) =>
isSuggesting
? theme.palette.sementic.red300
: theme.palette.greyScale.grey600};
background-color: ${({ theme, isSuggesting }) =>
isSuggesting
? css`
// grey 색상은 디자인 되어 있지 않아 임의로 설정하였습니다.
background-color: ${({ theme }) => theme.palette.greyScale.grey300};
`
: css`
background-color: pink;
`};
? theme.palette.sementic.red100
: theme.palette.greyScale.grey200};
`;
Loading