Skip to content

fix(profile): show additional user badges in one line (@fehmer) #7568

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

Merged
Miodec merged 2 commits into from
Mar 8, 2026
Merged

fix(profile): show additional user badges in one line (@fehmer) #7568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf6172
fix(profile): show additional user badges in one line (@fehmer)
fehmer Mar 8, 2026
36b3c5b
fix
fehmer Mar 8, 2026
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
8 changes: 5 additions & 3 deletions frontend/src/ts/components/common/UserBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ export function UserBadge(props: {
return (
<Show when={badge() !== undefined}>
<Balloon
class={cn("rounded-[0.5em] text-em-xs", props.class)}
class={cn(
"rounded-[0.5em] px-[0.75em] py-[0.5em] text-em-xs",
props.class,
)}
text={badge()?.description ?? ""}
{...props.balloon}
style={{
Expand All @@ -31,8 +34,7 @@ export function UserBadge(props: {
<Show when={badge()?.icon}>
<Fa
icon={badge()?.icon ?? "fa-question"}
fixedWidth={false}
class="px-[0.75em] py-[0.5em]"
fixedWidth={props.iconOnly === true}
/>
<Show when={!props.iconOnly}>
<span class="hidden pr-[0.75em] md:inline">{badge()?.name}</span>
Expand Down
36 changes: 20 additions & 16 deletions frontend/src/ts/components/pages/profile/UserDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,26 @@ function AvatarAndName(props: {
length: balloonPosition() === "up" ? "medium" : undefined,
}}
/>
<For
each={props.profile.inventory?.badges
.filter((it) => !it.selected)
.map((it) => it.id)}
>
{(badgeId) => (
<UserBadge
id={badgeId}
iconOnly
balloon={{
position: balloonPosition(),
length: balloonPosition() === "up" ? "medium" : undefined,
}}
/>
)}
</For>
<Show when={(props.profile.inventory?.badges?.length ?? 0) > 1}>
<div class="flex flex-row gap-1">
<For
each={props.profile.inventory?.badges
.filter((it) => !it.selected)
.map((it) => it.id)}
>
{(badgeId) => (
<UserBadge
id={badgeId}
iconOnly
balloon={{
position: balloonPosition(),
length: balloonPosition() === "up" ? "medium" : undefined,
}}
/>
)}
</For>
</div>
</Show>
<div class="grid">
<Balloon inline text={accountAgeHint()} position={balloonPosition()}>
Joined {formatDate(props.profile.addedAt ?? 0, "dd MMM yyyy")}
Expand Down