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

Redesign election ballots #2214

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
23a92c7
Refactored vote components
luisa-beerboom Apr 19, 2023
9c1b99a
Started restyling poll vote components
luisa-beerboom Apr 19, 2023
78f4041
Merge commit '4d16f75cc8ca89f16337c1ef220cf23c3a9b3dc6' into 2128-red…
luisa-beerboom Jun 7, 2023
d058e2b
Merge commit '219a13dc8a71718840c48c5e661882464ed8b392' into 2128-red…
luisa-beerboom Jun 7, 2023
1ddf581
cleanup after merge
luisa-beerboom Jun 7, 2023
cfd4949
Merge branch 'main' into 2128-redesign-election-ballots
luisa-beerboom Aug 18, 2023
3da8854
Merge branch 'main' into 2128-redesign-election-ballots
luisa-beerboom Mar 5, 2024
fbf7175
Strike through in red and some fixes
luisa-beerboom Mar 6, 2024
2dd6232
Add zebra list style
luisa-beerboom Mar 6, 2024
fecb013
Ensure that voting prohibition reason is shown correctly
luisa-beerboom Mar 7, 2024
02cd02a
Restyle buttons
luisa-beerboom Mar 15, 2024
1c317ff
Merge remote-tracking branch 'upstream/main' into 2128-redesign-elect…
luisa-beerboom Mar 15, 2024
e48e166
Add svg cross
luisa-beerboom Apr 11, 2024
a0162b0
Fix poll option title
luisa-beerboom Apr 11, 2024
17ba495
Merge remote-tracking branch 'upstream/main' into 2128-redesign-elect…
luisa-beerboom Apr 11, 2024
1f3e2c6
Merge branch 'main' into 2128-redesign-election-ballots
luisa-beerboom May 15, 2024
a1e135b
Fix icon colour and opacity
luisa-beerboom May 15, 2024
ac0a403
Fix meta conflict
luisa-beerboom May 15, 2024
750d16e
Fix layout
luisa-beerboom May 16, 2024
5f2e067
cleanup
luisa-beerboom May 16, 2024
22349cb
Merge remote-tracking branch 'upstream/main' into 2128-redesign-elect…
luisa-beerboom Jun 20, 2024
3af9990
Add structure level and mobile theme
luisa-beerboom Jun 20, 2024
9486d1e
Restyle poll vote area title
luisa-beerboom Jun 25, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,14 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User> {
}

private getLevelAndNumber(user: LevelAndNumberInformation): string {
const strings: string[] = [];
if (user.structureLevels()) {
strings.push(user.structureLevels());
}
if (user.number()) {
return `${this.translate.instant(`No.`)} ${user.number()}`;
} else {
return ``;
strings.push(`${this.translate.instant(`No.`)} ${user.number()}`);
}
return strings.join(` · `);
}

public getVerboseName = (plural = false): string => this.translate.instant(plural ? `Participants` : `Participant`);
Expand Down

This file was deleted.

Loading
Loading