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.

Sign up for GitHub

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

Fix/UI bug #424

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Fix/UI bug #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f166d48
style: add space on vote participate indicator text
hye1ee Oct 24, 2023
930f951
style: resolve color mismatch
hye1ee Oct 24, 2023
3e73b31
style: resolve design mismatch
hye1ee Oct 24, 2023
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 packages/web/src/components/atoms/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`};
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/molecules/AgendaCard/TerminatedAgendaCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const TerminatedAgendaCard: React.FC<Props> = ({ agenda }) => {
revealChoice={revealChoice}
voted={agenda.user.voted != null}
/>
<div css={[column, gap(12), w("fill")]}>
<div css={[column, gap(6), w("fill")]}>
{agenda.choices.map(choice => (
<OptionVoteResult
name={choice.name}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/molecules/OptionVoteResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const OptionVoteResult: React.FC<Props> = ({
<Box w="fill" h={30}>
<Background
percent={(count / totalCount) * 100}
color={userChoice ? "blue200" : "blue100"}
color={userChoice ? "blue300" : "blue200"}
borderColor={userChoice ? "blue300" : "gray200"}
>
<Box
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/molecules/VoteParticipate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const VoteParticipate: React.FC<Props> = ({ voted, total }) => {
const participantInfo = useMemo(
() =>
hover
? `투표 참여자 ${voted}명 /투표 대상자 ${total}명`
? `투표 참여자 ${voted}명 / 투표 대상자 ${total}명`
: `${voted}/${total}`,
[hover],
);
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/molecules/VoteResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const VoteResult: React.FC<Props> = ({
{voted ? (
<Text
variant="option2"
color="gray500"
color="gray400"
onClick={e => {
clickHandler(revealChoice);
e.stopPropagation();
Expand Down