Skip to content

fix: fa component breaking font-subset (@miodec) #7446

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
Jan 25, 2026
+1,666 −1,664
Merged

fix: fa component breaking font-subset (@miodec) #7446

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
6e9ad97
fix
Miodec Jan 25, 2026
b0e2072
Merge branch 'master' into fa-subset-fix
Miodec Jan 25, 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: 4 additions & 4 deletions frontend/__tests__/components/Button.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe("Button component", () => {
//
}}
fa={{
icon: "keyboard",
icon: "fa-keyboard",
}}
/>
));
Expand All @@ -70,7 +70,7 @@ describe("Button component", () => {
//
}}
fa={{
icon: "keyboard",
icon: "fa-keyboard",
fixedWidth: true,
}}
/>
Expand All @@ -88,7 +88,7 @@ describe("Button component", () => {
}}
fa={{
fixedWidth: true,
icon: "keyboard",
icon: "fa-keyboard",
}}
text="Hello"
/>
Expand All @@ -105,7 +105,7 @@ describe("Button component", () => {
//
}}
fa={{
icon: "keyboard",
icon: "fa-keyboard",
}}
text="Hello"
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ts/components/common/AsyncContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function AsyncContent<T>(
<>
<Show when={p.showLoader && props.resource.loading}>
<div class="preloader text-main p-4 text-center text-2xl">
<Fa icon="circle-notch" fixedWidth spin />
<Fa icon="fa-circle-notch" fixedWidth spin />
</div>
</Show>
{p.children(value())}
Expand All @@ -66,7 +66,7 @@ export default function AsyncContent<T>(
<Suspense
fallback={
<div class="preloader text-main p-4 text-center text-2xl">
<Fa icon="circle-notch" fixedWidth spin />
<Fa icon="fa-circle-notch" fixedWidth spin />
</div>
}
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/components/common/Fa.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function Fa(props: FaProps): JSXElement {
const variant = (): string => props.variant ?? "solid";
return (
<i
class={`fa-${props.icon}`}
class={props.icon}
classList={{
["fas"]: variant() === "solid",
["far"]: variant() === "regular",
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/ts/components/layout/footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function Footer(): JSXElement {
type="text"
text="contact"
fa={{
icon: "envelope",
icon: "fa-envelope",
fixedWidth: true,
}}
onClick={() => showModal("Contact")}
Expand All @@ -38,7 +38,7 @@ export function Footer(): JSXElement {
type="text"
text="support"
fa={{
icon: "donate",
icon: "fa-donate",
fixedWidth: true,
}}
onClick={() => showModal("Support")}
Expand All @@ -47,7 +47,7 @@ export function Footer(): JSXElement {
type="text"
text="github"
fa={{
icon: "code",
icon: "fa-code",
fixedWidth: true,
}}
href="https://github.com/monkeytypegame/monkeytype"
Expand All @@ -56,7 +56,7 @@ export function Footer(): JSXElement {
type="text"
text="discord"
fa={{
icon: "discord",
icon: "fa-discord",
variant: "brand",
fixedWidth: true,
}}
Expand All @@ -66,7 +66,7 @@ export function Footer(): JSXElement {
type="text"
text="twitter"
fa={{
icon: "twitter",
icon: "fa-twitter",
variant: "brand",
fixedWidth: true,
}}
Expand All @@ -76,7 +76,7 @@ export function Footer(): JSXElement {
type="text"
text="terms"
fa={{
icon: "file-contract",
icon: "fa-file-contract",
fixedWidth: true,
}}
href="/terms-of-service.html"
Expand All @@ -86,7 +86,7 @@ export function Footer(): JSXElement {
type="text"
text="security"
fa={{
icon: "shield-alt",
icon: "fa-shield-alt",
fixedWidth: true,
}}
/>
Expand All @@ -95,7 +95,7 @@ export function Footer(): JSXElement {
type="text"
text="privacy"
fa={{
icon: "lock",
icon: "fa-lock",
fixedWidth: true,
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/components/layout/footer/ScrollToTop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function ScrollToTop(): JSXElement {
});
}}
>
<Fa icon="angle-double-up" />
<Fa icon="fa-angle-double-up" />
</button>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ts/components/layout/footer/ThemeIndicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ export function ThemeIndicator(): JSXElement {
<div class="relative">
<Show when={getThemeIndicator().isFavorite}>
<div class="bg-bg absolute top-[-0.5em] right-[-0.5em] flex rounded-full p-[0.25em]">
<Fa icon="star" size={0.5} />
<Fa icon="fa-star" size={0.5} />
</div>
</Show>
<Fa icon="palette" fixedWidth />
<Fa icon="fa-palette" fixedWidth />
</div>
<div class="text">{getThemeIndicator().text}</div>
</button>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/components/layout/footer/VersionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function VersionButton(): JSXElement {

return (
<button type="button" class="textButton flex" onClick={handleClick}>
<Fa icon="code-branch" fixedWidth />
<Fa icon="fa-code-branch" fixedWidth />
<div class="text">{getVersionText()}</div>
<Show when={showNewIndicator()}>
<div
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ts/components/layout/overlays/Banners.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function Banner(props: BannerType): JSXElement {
remove();
}}
>
<Fa icon="times" fixedWidth />
<Fa icon="fa-times" fixedWidth />
</button>
}
/>
Expand Down Expand Up @@ -96,7 +96,7 @@ export function Banners(): JSXElement {
createEffectOn(() => getBanners().length, setGlobalOffsetSignal);

return (
<div ref={ref} class="fixed top-0 left-0 z-[1000] w-full">
<div ref={ref} class="fixed top-0 left-0 z-1000 w-full">
<For each={getBanners()}>{(banner) => <Banner {...banner} />}</For>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/components/layout/overlays/Overlays.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function Overlays(): JSXElement {
}}
tabIndex="-1"
>
<Fa icon="terminal" />
<Fa icon="fa-terminal" />
</button>
<Banners />
<MediaQueryDebugger />
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/ts/components/modals/ContactModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ export function ContactModal(): JSXElement {
text="Question"
class={buttonClass}
fa={{
icon: "question-circle",
icon: "fa-question-circle",
fixedWidth: true,
}}
/>
<Button
type="button"
href="mailto:contact@monkeytype.com?subject=[Feedback] "
fa={{
icon: "comment-dots",
icon: "fa-comment-dots",
fixedWidth: true,
}}
text="Feedback"
Expand All @@ -43,7 +43,7 @@ export function ContactModal(): JSXElement {
type="button"
href="mailto:support@monkeytype.com?subject=[Bug] "
fa={{
icon: "bug",
icon: "fa-bug",
fixedWidth: true,
}}
text="Bug Report"
Expand All @@ -53,7 +53,7 @@ export function ContactModal(): JSXElement {
type="button"
href="mailto:support@monkeytype.com?subject=[Account] "
fa={{
icon: "user-circle",
icon: "fa-user-circle",
fixedWidth: true,
}}
text="Account Help"
Expand All @@ -63,7 +63,7 @@ export function ContactModal(): JSXElement {
type="button"
href="mailto:jack@monkeytype.com?subject=[Business] "
fa={{
icon: "briefcase",
icon: "fa-briefcase",
fixedWidth: true,
}}
text="Business Inquiry"
Expand All @@ -73,7 +73,7 @@ export function ContactModal(): JSXElement {
type="button"
href="mailto:contact@monkeytype.com?subject=[Other] "
fa={{
icon: "ellipsis-h",
icon: "fa-ellipsis-h",
fixedWidth: true,
}}
text="Other"
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/ts/components/modals/SupportModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function SupportModal(): JSXElement {
<div>
Thank you so much for thinking about supporting this project. It would
not be possible without you and your continued support.{" "}
<Fa icon="heart" />
<Fa icon="fa-heart" />
</div>
<div class="xs:grid-cols-2 grid grid-cols-1 gap-4 md:grid-cols-4">
<Button
Expand All @@ -29,7 +29,7 @@ export function SupportModal(): JSXElement {
showModal("Commandline");
}}
fa={{
icon: "ad",
icon: "fa-ad",
fixedWidth: true,
size: iconScale,
}}
Expand All @@ -40,7 +40,7 @@ export function SupportModal(): JSXElement {
type="button"
href="https://ko-fi.com/monkeytype"
fa={{
icon: "donate",
icon: "fa-donate",
fixedWidth: true,
size: iconScale,
}}
Expand All @@ -52,7 +52,7 @@ export function SupportModal(): JSXElement {
href="https://www.patreon.com/monkeytype"
fa={{
variant: "brand",
icon: "patreon",
icon: "fa-patreon",
fixedWidth: true,
size: iconScale,
}}
Expand All @@ -63,7 +63,7 @@ export function SupportModal(): JSXElement {
type="button"
href="https://monkeytype.store"
fa={{
icon: "tshirt",
icon: "fa-tshirt",
fixedWidth: true,
size: iconScale,
}}
Expand Down
Loading