Skip to content

Commit

Permalink
style: improve labels (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
edalholt authored Sep 25, 2023
1 parent 8d5dd77 commit 3c9cd08
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
9 changes: 8 additions & 1 deletion frontend/src/components/VotationBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,16 @@ export function VotationBox(state: {
<Text fz={"lg"} fw={700} ta={"left"}>
{currentVotation.title}
</Text>
<Text fz={"md"} mb={25} ml={10} ta={"left"}>
<Text fz={"md"} mb={10} ta={"left"}>
{currentVotation.voteText}
</Text>
{currentVotation.maximumOptions > 1 && (
<>
<Text fz={"md"} mb={10} ta={"left"}>
You can choose up to {currentVotation.maximumOptions} options
</Text>
</>
)}
<Flex
mih={50}
gap="xs"
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/VotationPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ function VotationPanel({
data-testid="maxOptionsInput"
withAsterisk
required
label="Max allowd options to choose"
label="Maximum selectable options"
className={classes.inputStyle}
placeholder="Max allowd options to choose"
placeholder="Maximum selectable options"
defaultValue={1}
{...form.getInputProps("maximumOptions")}
/>
Expand Down Expand Up @@ -270,6 +270,8 @@ function VotationPanel({
: option.title + ""
)}
</Text>
<Text fw={"700"}>Maximum selectable options:</Text>
<Text>{votation.maximumOptions}</Text>
</Box>
</Flex>
<Flex
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/pages/AssemblyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,12 @@ export function AssemblyLobby() {
<WaitingRoom message={"There are currently no active vote, look up!"} />
) : (
<>
{groupName && <Text size={"xl"}>Check-in for {groupName}</Text>}
{groupName && <Text size={"xl"}>Check-in</Text>}
{groupName && (
<Text size={"sm"} mb={10}>
Please present this QR-code to the secretary when entering.
</Text>
)}
<QrCode />
</>
)}
Expand Down

0 comments on commit 3c9cd08

Please sign in to comment.