Skip to content

Commit

Permalink
Merge pull request #322 from ungdev/dev
Browse files Browse the repository at this point in the history
Fix/fixes (#321)
  • Loading branch information
TeddyRoncin authored Nov 8, 2023
2 parents 249302b + 9821278 commit 7f7f540
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/app/tournaments/[id]/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export function TournamentInformation({ tournamentId, animate = true }: { tourna
? 'À venir'
: tournament.casters.length === 0
? 'Aucun caster pour ce tournoi'
: tournament.casters?.map((caster) => caster.name + ' ')}
: tournament.casters?.map((caster) => caster.name).join(', ')}
</BoxContainer>
</div>
{loginAllowed &&
Expand Down
2 changes: 1 addition & 1 deletion src/app/tournaments/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export function TournamentHome({
<p>
{renderedTournament.casters !== null && renderedTournament.casters.length > 0 && (
<>
Casté par <strong>{renderedTournament.casters?.map((caster) => caster.name + ' ')}</strong>
Casté par <strong>{renderedTournament.casters?.map((caster) => caster.name).join(', ')}</strong>
</>
)}
</p>
Expand Down
48 changes: 24 additions & 24 deletions src/components/dashboard/TournamentModal.module.scss
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
.casters {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 1rem;
margin-bottom: 1rem;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 1rem;
margin-bottom: 1rem;

>p{
font-size: 1rem;
font-weight: 600;
}
> p {
font-size: 1rem;
font-weight: 600;
}
}

.caster {
display: flex;
justify-content: space-between;
align-items: flex-end;
gap: 1rem;
display: flex;
justify-content: space-between;
align-items: flex-end;
gap: 1rem;

>button {
margin: 1.25rem 0;
padding: 0.75rem 1rem;
>svg{
width: 24px;
}
> button {
margin: 1.25rem 0;
padding: 0.75rem 1rem;
svg {
width: 24px;
}
}
}

.displayCheckboxes {
display: flex;
column-gap: 1rem;
row-gap: 0.5rem;
flex-wrap: wrap;
margin-bottom: 2rem;
display: flex;
column-gap: 1rem;
row-gap: 0.5rem;
flex-wrap: wrap;
margin-bottom: 2rem;
}
3 changes: 1 addition & 2 deletions src/components/dashboard/TournamentModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ const TournamentModal = ({
setCasters(newCasters);
setCastersCount(castersCount - 1);
}}>
{/* TODO: make it work */}
<Icon name={IconName.Trash} />
<Icon name={IconName.Trash} className={styles.trashIcon} />
</Button>
</div>
))}
Expand Down

0 comments on commit 7f7f540

Please sign in to comment.