From f166d482fc37aea6c1d91ce1168b09047b5f2bc4 Mon Sep 17 00:00:00 2001 From: hye1ee Date: Tue, 24 Oct 2023 23:16:34 +0900 Subject: [PATCH 1/3] style: add space on vote participate indicator text --- packages/web/src/components/molecules/VoteParticipate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/components/molecules/VoteParticipate.tsx b/packages/web/src/components/molecules/VoteParticipate.tsx index 2e139a8e..198c3de3 100644 --- a/packages/web/src/components/molecules/VoteParticipate.tsx +++ b/packages/web/src/components/molecules/VoteParticipate.tsx @@ -11,7 +11,7 @@ export const VoteParticipate: React.FC = ({ voted, total }) => { const participantInfo = useMemo( () => hover - ? `투표 참여자 ${voted}명 /투표 대상자 ${total}명` + ? `투표 참여자 ${voted}명 / 투표 대상자 ${total}명` : `${voted}/${total}`, [hover], ); From 930f95100a393bc8d58467fa3734a998995a8254 Mon Sep 17 00:00:00 2001 From: hye1ee Date: Tue, 24 Oct 2023 23:21:41 +0900 Subject: [PATCH 2/3] style: resolve color mismatch --- packages/web/src/components/atoms/Card.tsx | 2 +- packages/web/src/components/molecules/VoteResult.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/src/components/atoms/Card.tsx b/packages/web/src/components/atoms/Card.tsx index 01ffb38b..5b93c53d 100644 --- a/packages/web/src/components/atoms/Card.tsx +++ b/packages/web/src/components/atoms/Card.tsx @@ -25,7 +25,7 @@ export const Card = styled.div<{ background-color: ${primary ? theme.colors.blue100 : theme.colors.white}; border: 1px solid ${(() => { - if (bold) return primary ? theme.colors.blue600 : theme.colors.gray500; + if (bold) return primary ? theme.colors.blue600 : theme.colors.gray400; return primary ? theme.colors.blue300 : theme.colors.gray300; })()}; padding: ${small ? `12px 15px` : `18px 20px`}; diff --git a/packages/web/src/components/molecules/VoteResult.tsx b/packages/web/src/components/molecules/VoteResult.tsx index 19b77e4a..fe1c8b2b 100644 --- a/packages/web/src/components/molecules/VoteResult.tsx +++ b/packages/web/src/components/molecules/VoteResult.tsx @@ -22,7 +22,7 @@ export const VoteResult: React.FC = ({ {voted ? ( { clickHandler(revealChoice); e.stopPropagation(); From 3e73b311ff7a061d9f4de347fd445c82bfb5554a Mon Sep 17 00:00:00 2001 From: hye1ee Date: Tue, 24 Oct 2023 23:24:45 +0900 Subject: [PATCH 3/3] style: resolve design mismatch --- .../components/molecules/AgendaCard/TerminatedAgendaCard.tsx | 2 +- packages/web/src/components/molecules/OptionVoteResult.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/src/components/molecules/AgendaCard/TerminatedAgendaCard.tsx b/packages/web/src/components/molecules/AgendaCard/TerminatedAgendaCard.tsx index 812280cc..c3593c24 100644 --- a/packages/web/src/components/molecules/AgendaCard/TerminatedAgendaCard.tsx +++ b/packages/web/src/components/molecules/AgendaCard/TerminatedAgendaCard.tsx @@ -60,7 +60,7 @@ export const TerminatedAgendaCard: React.FC = ({ agenda }) => { revealChoice={revealChoice} voted={agenda.user.voted != null} /> -
+
{agenda.choices.map(choice => ( = ({