Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/// <reference types="astro/client" />
/// <reference path="content.d.ts" />
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Logomark",
"mariah",
"MBTA",
"Merch",
"mitropoulos",
"mulroy",
"Murg",
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
"konami-emoji-blast": "^0.5.9",
"lodash": "^4.17.21",
"sharp": "^0.34.1",
"temporal-polyfill": "^0.3.0"
"temporal-polyfill": "^0.3.0",
"uqr": "^0.1.2",
"wifi-share-link": "^0.1.1"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
Expand Down
17 changes: 17 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const yearPairs =
))
}
</div>
<Socials />
<Socials class="footer-socials" />
</div>
</ContentArea>
</footer>
Expand Down Expand Up @@ -82,6 +82,18 @@ const yearPairs =
text-decoration: none;
}

.footer-socials {
margin-top: 2rem;
max-width: 15rem;
}

@media (width >= 490px) {
.footer-socials {
margin-top: 0;
max-width: none;
}
}

@media (width >= 819px) {
.footer-content-area {
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Logo.astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
import { ClassificationTypeNames } from "typescript";
import TextSquiggly from "./TextSquiggly.astro";

interface Props {
Expand Down Expand Up @@ -38,6 +37,7 @@ const { class: className, invert, year, ...props } = Astro.props;
.logo.regular {
--colorLogoText: var(--colorWhiteIsh);
--colorLogoYear: var(--colorBlue2);
text-shadow: 0px 1.5px 1.5px rgba(0, 0, 0, 0.25);
}

.year {
Expand Down
35 changes: 35 additions & 0 deletions src/components/LogoBold.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
import TextSquiggly from "./TextSquiggly.astro";

interface Props {
class?: string;
year: number;
}

const { class: className, ...props } = Astro.props;
---

<div class:list={["logo-bold", className]} {...props}>
<TextSquiggly width="medium">
<Fragment slot="inside">Squiggle</Fragment>
<Fragment slot="after">Conf</Fragment>
</TextSquiggly>
{Astro.props.year && <span class="year">{Astro.props.year}</span>}
</div>

<style>
.logo-bold {
color: var(--colorWhiteIsh);
font-family: var(--fontFamilyLogo);
font-weight: var(--fontWeightLogo);
font-size: var(--fontSizeLogoLarge);
font-style: initial;
text-shadow: 0px 1.5px 1.5px rgba(0, 0, 0, 0.25);
}

.year {
color: var(--colorAccentMedium);
font-family: var(--fontFamilyHeading);
font-weight: var(--fontWeightBold);
}
</style>
36 changes: 31 additions & 5 deletions src/components/SocialLink.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,33 @@
import { ImageMetadata } from "astro";
import { Image } from "astro:assets";

export type SocialLinkSize = "small" | "normal" | "large";

interface Props {
alt: string;
class?: string;
href: string;
inverted?: boolean;
size?: SocialLinkSize;
src: ImageMetadata;
}

const { alt, class: className, inverted, href, src } = Astro.props;
const {
alt,
class: className,
inverted,
href,
size = "normal",
src,
} = Astro.props;
---

<a
class:list={["social-link", inverted && "social-link-inverted"]}
class:list={["social-link", className, inverted && "social-link-inverted"]}
href={href}
target="_blank"
>
<Image alt={alt} class="social-image" src={src} />
<Image alt={alt} class:list={["social-image", size]} src={src} />
</a>

<style>
Expand All @@ -30,8 +40,24 @@ const { alt, class: className, inverted, href, src } = Astro.props;
text-decoration: none;
}

.social-image.small {
--sizeSocialImage: 1.5rem;
}

.social-image.normal {
--sizeSocialImage: 2rem;
}

.social-image.large {
--sizeSocialImage: 4rem;
}

.social-image {
height: 2rem;
width: 2rem;
height: var(--sizeSocialImage);
width: var(--sizeSocialImage);
}

html:not(.dark) .social-link-inverted {
filter: hue-rotate(180deg) invert();
}
</style>
50 changes: 43 additions & 7 deletions src/components/Socials.astro
Original file line number Diff line number Diff line change
@@ -1,27 +1,63 @@
---
import { socials } from "~/data/socials";

import SocialLink from "./SocialLink.astro";
import SocialLink, { SocialLinkSize } from "./SocialLink.astro";

export type SocialsPadding = "dense" | "normal";

interface Props {
class?: string;
inverted?: boolean;
padding?: SocialsPadding;
size?: SocialLinkSize;
}

const {
class: className,
inverted,
padding = "normal",
size,
...props
} = Astro.props;
---

<div class="socials">
{socials.map((social) => <SocialLink class="social-link" {...social} />)}
<div
class:list={[
"socials",
className,
padding === "dense" ? "socials-dense" : "socials-normal",
]}
{...props}
>
{
socials.map((social) => (
<SocialLink
class="social-link"
inverted={inverted}
{...social}
size={size}
/>
))
}
</div>

<style>
.socials {
display: flex;
flex-wrap: wrap;
}

.socials-dense {
gap: 0.5rem;
}

.socials-normal {
gap: 2rem;
margin-top: 2rem;
max-width: 15rem;
}

@media (width >= 490px) {
.socials {
gap: 1rem;
margin-top: 0;
max-width: none;
}
}
</style>
8 changes: 6 additions & 2 deletions src/components/TextSquiggly.astro
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import squigglyMedium from "~/assets/design/squiggly-medium.svg";
import squigglyWide from "~/assets/design/squiggly-wide.svg";

interface Props {
class?: string;
renderAs?: string;
width: "medium" | "wide";
}
Expand All @@ -13,10 +14,13 @@ const images = {
wide: squigglyWide,
};

const { renderAs: As = "em", width } = Astro.props;
const { class: className, renderAs: As = "em", width, ...props } = Astro.props;
---

<As class:list={["text-squiggly", `text-squiggly-${width}`]}>
<As
class:list={["text-squiggly", `text-squiggly-${width}`, className]}
{...props}
>
<span class="text"><slot name="inside" /></span><Image
alt=""
class="squiggly"
Expand Down
8 changes: 8 additions & 0 deletions src/data/links.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
export const links = {
bluesky: "https://bsky.app/profile/squiggleconf.com",
bostonTSClub: "https://bostonts.club",
cfp: "https://cfp.squiggleconf.com",
cfpQuestionsDiscord:
"https://discord.com/channels/1181983343387099207/1244808425762848938",
cfpQuestionsEmail: "mailto:cfp@squiggleconf.com",
discord: "https://discord.squiggleconf.com",
donate: "https://www.paypal.com/US/fundraiser/charity/5334863",
feedback: "http://feedback.squiggleconf.com",
github: "https://www.github.com/SquiggleTools/SquiggleConf.com",
instagram: "https://www.instagram.com/squiggleconf",
linkedin: "https://www.linkedin.com/company/squiggleconf",
mastodon: "https://fosstodon.org/@SquiggleConf",
michiganTypeScript: "https://youtube.com/@MichiganTypeScript",
partner: "https://partner.squiggleconf.com",
shop: "https://shop.squiggle.tools",
sponsor: "https://sponsor.squiggleconf.com",
tickets: "https://buytickets.at/squiggleconf/1488622",
volunteer: "https://volunteer.squiggleconf.com",
x: "https://x.com/SquiggleConf",
youtube: "https://www.youtube.com/@SquiggleConf",
};
2 changes: 1 addition & 1 deletion src/data/socials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const socials = [
src: bluesky,
},
{
alt: "Instgram",
alt: "Instagram",
href: "https://www.instagram.com/squiggleconf",
src: instagram,
},
Expand Down
1 change: 1 addition & 0 deletions src/layouts/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
--fontSizeLarger: clamp(2rem, 4.5vw, 3rem);
--fontSizeHero: clamp(2rem, 5vw, 3rem);
--fontSizeLogo: clamp(1.75rem, 4.375vw, 2.25rem);
--fontSizeLogoLarge: clamp(2.5rem, 5.25vw, 3rem);

--fontWeightLight: 200;
--fontWeightMedium: 300;
Expand Down
Loading