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

remove custom fontawesome icons #226

Merged
merged 6 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
687 changes: 583 additions & 104 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"rollup": "^3.29.4",
"sass": "^1.69.4",
"semver-compare": "^1.0.0",
"swagger-ui": "4.5.2",
"swagger-ui": "^4.19.1",
"typescript": "^4.9.5"
},
"dependencies": {
Expand Down
1 change: 1 addition & 0 deletions src/components/assets/icon/solid/curseforge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/assets/icon/solid/modrinth-small.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/assets/icon/solid/modrinth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/assets/icon/solid/pumpkin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion src/components/parts/team/TeamMember.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import type { TeamMember,} from "@data/Team";
import { t } from "i18next";
import SystemMembers from "./SystemMembers.astro";

import CurseforgeLogo from '../../assets/icon/solid/curseforge.svg?raw';
import ModrinthLogo from '../../assets/icon/solid/modrinth.svg?raw';
import ModrinthLogoSmall from '../../assets/icon/solid/modrinth-small.svg?raw';

export interface Props {
member: TeamMember;
isLeader: boolean,
Expand All @@ -11,6 +15,13 @@ const { member, isLeader } = Astro.props as Props;

// this is the "N/A" text, for anyone wondering
const na = t("team:n-a");

let customIcons: any[any] = {
UpcraftLP marked this conversation as resolved.
Show resolved Hide resolved
'curseforge': CurseforgeLogo,
'modrinth': ModrinthLogo,
'modrinth-small': ModrinthLogoSmall,
}

---
<style>
.z-60 { z-index: 60; }
Expand Down Expand Up @@ -66,7 +77,7 @@ const na = t("team:n-a");
<p class="subtitle is-6 is-links">
{member.links.map((link) => (
<a href={link.url}>
<i class:list={["fa-lg", link.icon]} />
{link.icon.startsWith('custom:') ? (<span style="width: 1.25em; vertical-align: -.2em; display:inline-block;"><Fragment set:html={customIcons[link.icon.substring('custom:'.length)]} /></span>) : (<i class:list={["fa-lg", link.icon]} />)}
</a>
))}
</p>
Expand Down
8 changes: 7 additions & 1 deletion src/components/parts/timeline/Item.astro
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
---
import PumpkinIcon from '../../assets/icon/solid/pumpkin.svg?raw';

export interface Props {
id: string;
title: string;
icon: string;
}

const { id, title, icon } = Astro.props as Props;

const customIcons: any[any] = {
'pumpkin': PumpkinIcon,
}
---

<div class="timeline-item">
<div class="timeline-marker is-icon is-dark">
<i class={icon}></i>
{icon.startsWith('custom:') ? (<div style="min-width: 1.25em; padding-top: 0.4em; display:inline-block;"><Fragment set:html={customIcons[icon.substring('custom:'.length)]} /></div>) : (<i class={icon} />)}
</div>

<div class="timeline-content">
Expand Down
28 changes: 14 additions & 14 deletions src/data/TeamData.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
url: "https://tech.lgbt/@ADudeCalledLeo",
},
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/ADudeCalledLeo",
},
],
Expand All @@ -44,7 +44,7 @@ export default {
url: "https://alexiil.uk",
},
{
icon: "fak fa-curseforge",
icon: "custom:curseforge",
url: "https://www.curseforge.com/members/alexiil/projects",
},
],
Expand Down Expand Up @@ -83,11 +83,11 @@ export default {
url: "https://tech.lgbt/@ennui",
},
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/Ennui",
},
{
icon: "fak fa-curseforge",
icon: "custom:curseforge",
url: "https://www.curseforge.com/members/ennuilangeweile",
},
],
Expand Down Expand Up @@ -162,7 +162,7 @@ export default {
url: "https://twitter.com/jamalamisadev",
},
{
icon: "fak fa-curseforge",
icon: "custom:curseforge",
url: "https://www.curseforge.com/members/Jamalam360/projects",
},
],
Expand Down Expand Up @@ -200,7 +200,7 @@ export default {
url: "https://git.lambdaurora.dev/",
},
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/LambdAurora",
},
],
Expand Down Expand Up @@ -239,7 +239,7 @@ export default {
description: "Professional memer",
links: [
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/obj-obj",
},
],
Expand Down Expand Up @@ -270,11 +270,11 @@ export default {
url: "https://twitter.com/realOroArmor",
},
{
icon: "fak fa-curseforge",
icon: "custom:curseforge",
url: "https://www.curseforge.com/members/oroarmor/projects",
},
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/h74rYEcI",
},
],
Expand All @@ -287,7 +287,7 @@ export default {
systemMembers: "---",
links: [
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/moehreag"
}
]
Expand All @@ -312,11 +312,11 @@ export default {
url: "https://quiltservertools.net",
},
{
icon: "fak fa-curseforge",
icon: "custom:curseforge",
url: "https://www.curseforge.com/members/potatoboy99999/projects",
},
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/Potatoboy9999",
},
],
Expand Down Expand Up @@ -369,7 +369,7 @@ export default {
url: "https://concern.i.ng",
},
{
icon: "fa-brands fa-mastodon",
icon: "fab fa-mastodon",
url: "vmst.io/@sschr15",
},
],
Expand Down Expand Up @@ -413,7 +413,7 @@ export default {
avatar: "https://avatars.githubusercontent.com/u/17211100?v=4",
links: [
{
icon: "fak fa-modrinth-small",
icon: "custom:modrinth-small",
url: "https://modrinth.com/user/woodiertexas",
},
]
Expand Down
2 changes: 1 addition & 1 deletion src/pages/en/about/timeline.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ import site from "@data/Site";
</figure>

</Item>
<Item id="2021-04-20-later" title="April 20th, 2021 (Later)" icon="fas fa-pumpkin">
<Item id="2021-04-20-later" title="April 20th, 2021 (Later)" icon="custom:pumpkin">
On the Community server, a game of [skribbl.io](https://skribbl.io) was played to celebrate the server's opening to the public. During this game, a player was tasked with drawing a pumpkin, and many of the players guessed "pineapple". This drawing quickly became a community favourite, and Pineapple was born -- Quilt's first community mascot.

<figure>
Expand Down