Skip to content

Commit 7e6f666

Browse files
committed
fix: the badge typography
1 parent cf701b0 commit 7e6f666

File tree

8 files changed

+19
-22
lines changed

8 files changed

+19
-22
lines changed

src/components/cards/Bounty.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,10 @@ export default function BountyCard({ bounty }: BountyProps): ReactElement {
8585
customStyle={{
8686
bottom: "-4px",
8787
right: "-4px",
88-
fontSize: 14,
8988
backgroundColor: bounty.colors.accent,
9089
}}
91-
size="medium"
9290
value={bounty?.unreviewedSubmissionsCount}
93-
className="bottom-0 -right-1 absolute p-4"
91+
className="bottom-0 -right-1 absolute"
9492
/>
9593
)}
9694
</Component>
@@ -145,12 +143,10 @@ export default function BountyCard({ bounty }: BountyProps): ReactElement {
145143
customStyle={{
146144
bottom: "-4px",
147145
right: "-4px",
148-
fontSize: 14,
149146
backgroundColor: bounty.colors.accent,
150147
}}
151-
size="medium"
152148
value={bounty?.unreviewedSubmissionsCount}
153-
className="bottom-0 -right-1 absolute p-4"
149+
className="bottom-0 -right-1 absolute"
154150
/>
155151
)}
156152
</Component>

src/components/cards/Submission.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default function SubmissionCard({ submission, link = "", children }: Subm
9797
)}
9898
{submission.metadata && submission.metadata.evaluation ? (
9999
<div className="inline-flex flex-1 items-center space-x-1">
100-
<Badge customStyle={badgeButtonStyles} size="medium" className="relative" value={submission.metadata.evaluation.points} />
100+
<Badge customStyle={badgeButtonStyles} className="relative" value={submission.metadata.evaluation.points} />
101101
<span className="text-sm leading">{t("submissions.evaluation.points")}</span>
102102
</div>
103103
) : (

src/components/cards/User.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export default function UserCard({ boxLayout, link, bordered, expanded, user, ba
9292
<Badge
9393
value={badge}
9494
className="absolute"
95-
size="medium"
9695
customStyle={{
9796
bottom: "-1px",
9897
right: "-3px",

src/components/list/Scoreboard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default function ScoreboardList({ badgeStyles = { backgroundColor: "purpl
5454
<div className="relative">
5555
<div className="absolute md:relative right-2 md:-bottom-10 -bottom-14 md:top-0">
5656
<Avatar user={user} size="large" />
57-
<Badge className="absolute left-9 top-10 w-6 h-6" value="1" customStyle={badgeStyles} />
57+
<Badge className="absolute left-9 top-10" value="1" customStyle={badgeStyles} />
5858
</div>
5959
</div>
6060
</div>

src/components/popups/NotificationPopup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default function NotificationPopup({ buttonStyles }: NotificationPopupPro
6464
<li className={`inline-block align-middle mr-2 relative text-gray-500 max-w-80 ${isNotificationVisible ? "z-50" : "z-10"}`} onClick={toggle}>
6565
<Button type="button" padding={false} variant="secondary" className="p-2 bg-gray-100 bg-opacity-75 hover:bg-gray-50 text-primary" customStyle={buttonStyles}>
6666
<BellIcon />
67-
{unread > 0 && <Badge value={unread} className="top-0 -right-1 absolute" />}
67+
{unread > 0 && <Badge value={unread} className="top-0 -right-1 absolute" size="small"/>}
6868
</Button>
6969
</li>
7070
{isNotificationVisible && (

src/components/sections/submissions/_partials/SubmissionCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default function SubmissionCard({ submission }: SubmissionCard): ReactEle
9191
</span>
9292
<p className="line-clamp-3 text-sm lg:text-base">{submission.text}</p>
9393
<div className="pt-5">
94-
<Badge customStyle={{ backgroundColor: colors?.textAccent }} size="medium" className="relative left-0" value={submission.metadata.evaluation.points} />
94+
<Badge customStyle={{ backgroundColor: colors?.textAccent }} className="relative left-0" value={submission.metadata.evaluation.points} />
9595
<span className="ml-1 text-sm">{t("submissions.evaluation.points")}</span>
9696
</div>
9797
</div>

src/components/ui/Badge.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ interface BadgeProps extends Omit<HTMLProps<HTMLSpanElement>, "size"> {
2929
}
3030
* @returns {ReactElement}
3131
*/
32-
export default function Badge({ customStyle, value, size = "small", className, testId = "badgeId", ...props }: BadgeProps): ReactElement {
33-
const sizeClasses = useMemo(
34-
() =>
35-
({
36-
medium: "w-6 h-6 text-sm",
37-
small: "h-4 w-4 text-xxs",
38-
}[size]),
39-
[size]
40-
);
32+
export default function Badge({ customStyle, value, size = "medium", className, testId = "badgeId", ...props }: BadgeProps): ReactElement {
33+
const sizeClasses = useMemo(() => {
34+
const expandedClasses = "w-7 h-7";
35+
const defaultClasses = "w-6 h-6";
36+
37+
if (value && value.toString().length >= 3) {
38+
return expandedClasses;
39+
}
40+
if (size === "small") return "w-4 h-4";
41+
return defaultClasses;
42+
}, [value, size]);
4143

4244
const router = useRouter();
4345
const isCommunity: boolean = router.pathname.startsWith("communities-slug__");
@@ -50,7 +52,7 @@ export default function Badge({ customStyle, value, size = "small", className, t
5052
data-testid={testId}
5153
{...props}
5254
className={classNames(
53-
"font-semibold leading-3 text-center inline-flex items-center justify-center rounded-full text-xxs",
55+
`font-semibold leading-3 text-center inline-flex items-center justify-center rounded-full ${size ==="small"? "text-xxs":"text-sm"}`,
5456
sizeClasses,
5557
className,
5658
{ "bg-white text-gray-900": isCommunity },

src/components/ui/Tag.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default function Tag({ rounded = true, type = "gray", value, children, te
4646
);
4747
return (
4848
<div {...props} className={tagClassNames} data-testid={testId}>
49-
<span className="text-xs font-medium block leading-none">{value ? <span data-testid={tagValueTestId}>{value}</span> : children}</span>
49+
<span className="text-xs font-medium block leading-3.5">{value ? <span data-testid={tagValueTestId}>{value}</span> : children}</span>
5050
</div>
5151
);
5252
}

0 commit comments

Comments
 (0)