From 7a461bdd8fa39498322cf0fe8a18226f39f52d9f Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 9 Aug 2024 13:05:50 -0400 Subject: [PATCH] feat: more tweaks of speaker page --- src/components/AdContents.astro | 16 +---- src/components/AdTitle.astro | 9 +++ src/components/AdTitleAndSubtitle.astro | 27 +++++++++ src/components/SessionTag.astro | 3 +- src/pages/ad/inngest.astro | 10 +++- src/pages/ad/openjs-foundation.astro | 13 ++-- src/pages/ad/speaker/[slug].astro | 79 +++++++++++-------------- src/pages/ad/speakers.astro | 13 ++-- 8 files changed, 100 insertions(+), 70 deletions(-) create mode 100644 src/components/AdTitle.astro create mode 100644 src/components/AdTitleAndSubtitle.astro diff --git a/src/components/AdContents.astro b/src/components/AdContents.astro index 6974857..e22d4d4 100644 --- a/src/components/AdContents.astro +++ b/src/components/AdContents.astro @@ -1,19 +1,13 @@ --- import HeroName from "./HeroName.astro"; - -interface Props { - subTitle?: string; - title: string; -} ---
-

{Astro.props.title}

- {Astro.props.subTitle} +
- +
@@ -42,10 +36,6 @@ interface Props { } h1 { - font-size: 3rem; - } - - strong { - font-size: 4.5rem; + font-size: 7.5rem; } diff --git a/src/components/AdTitle.astro b/src/components/AdTitle.astro new file mode 100644 index 0000000..792e4e2 --- /dev/null +++ b/src/components/AdTitle.astro @@ -0,0 +1,9 @@ +

+ + diff --git a/src/components/AdTitleAndSubtitle.astro b/src/components/AdTitleAndSubtitle.astro new file mode 100644 index 0000000..9a9d4da --- /dev/null +++ b/src/components/AdTitleAndSubtitle.astro @@ -0,0 +1,27 @@ +--- +interface Props { + title: string; + subTitle: string; +} +--- + +
+

{Astro.props.title}

+ {Astro.props.subTitle} +
+ + diff --git a/src/components/SessionTag.astro b/src/components/SessionTag.astro index 0391a5c..9f84a91 100644 --- a/src/components/SessionTag.astro +++ b/src/components/SessionTag.astro @@ -174,17 +174,18 @@ const isLight = whiteStrokeIcons.includes(image); background-color: var(--colorBackdropOff); border: 1px solid var(--colorDull); border-radius: 0.25rem; - padding: 0.125rem 0.25rem 0.125rem 0.125rem; white-space: nowrap; cursor: default; } .tag-normal { font-size: 1rem; + padding: 0.125rem 0.25rem 0.125rem 0.125rem; } .tag-large { font-size: 1.5rem; + padding: 0.5rem 0.5rem 0.35rem; } .light-icon { diff --git a/src/pages/ad/inngest.astro b/src/pages/ad/inngest.astro index dd830cf..6a8cd60 100644 --- a/src/pages/ad/inngest.astro +++ b/src/pages/ad/inngest.astro @@ -5,6 +5,7 @@ import "@fontsource/urbanist"; import inngest from "~/assets/sponsors/inngest.svg"; import AdContents from "~/components/AdContents.astro"; import AdImage from "~/components/AdImage.astro"; +import AdTitleAndSubtitle from "~/components/AdTitleAndSubtitle.astro"; import DeepBlueSea from "~/components/DeepBlueSea.astro"; import Head from "~/components/Head.astro"; @@ -17,8 +18,13 @@ import "~/layouts/normalize.css";
- - + + +
diff --git a/src/pages/ad/openjs-foundation.astro b/src/pages/ad/openjs-foundation.astro index 065ce3c..2121087 100644 --- a/src/pages/ad/openjs-foundation.astro +++ b/src/pages/ad/openjs-foundation.astro @@ -5,6 +5,7 @@ import "@fontsource/urbanist"; import openjsFoundationLight from "~/assets/sponsors/openjs-foundation-light.svg"; import AdContents from "~/components/AdContents.astro"; import AdImage from "~/components/AdImage.astro"; +import AdTitleAndSubtitle from "~/components/AdTitleAndSubtitle.astro"; import DeepBlueSea from "~/components/DeepBlueSea.astro"; import Head from "~/components/Head.astro"; @@ -17,11 +18,13 @@ import "~/layouts/normalize.css";
- - + + +
diff --git a/src/pages/ad/speaker/[slug].astro b/src/pages/ad/speaker/[slug].astro index c9bf8ef..51a8697 100644 --- a/src/pages/ad/speaker/[slug].astro +++ b/src/pages/ad/speaker/[slug].astro @@ -1,12 +1,11 @@ --- import "@fontsource-variable/josefin-sans"; import "@fontsource/urbanist"; -import { Image } from "astro:assets"; import AdContents from "~/components/AdContents.astro"; +import AdTitle from "~/components/AdTitle.astro"; import SafeMarkdown from "~/components/SafeMarkdown.astro"; import SessionTags from "~/components/SessionTags.astro"; -import Speaker from "~/components/Speaker.astro"; import SpeakerImage from "~/components/SpeakerImage.astro"; import SubtleCard from "~/components/SubtleCard.astro"; import { peopleBySlug, talksBySlug } from "~/data/notion-data"; @@ -25,56 +24,46 @@ const talks = Object.values(talksBySlug).filter((talk) => --- - - - - -
- {talks.map((talk) =>

{talk.title}

)} - { - talks.map((talk) => ( - - )) - } -
-
- -
-
- + + {speaker.name} + + +
+ +
+
+ {talks.map((talk) =>

{talk.title}

)} +
+
+ +
+
+ +
-
- + +
    + {talks.map((talk) => )} +
+ diff --git a/src/pages/ad/speakers.astro b/src/pages/ad/speakers.astro index 15949cb..1cebc96 100644 --- a/src/pages/ad/speakers.astro +++ b/src/pages/ad/speakers.astro @@ -3,8 +3,7 @@ import "@fontsource-variable/josefin-sans"; import "@fontsource/urbanist"; import AdContents from "~/components/AdContents.astro"; -import DeepBlueSea from "~/components/DeepBlueSea.astro"; -import Head from "~/components/Head.astro"; +import AdTitleAndSubtitle from "~/components/AdTitleAndSubtitle.astro"; import SpeakerSmall from "~/components/SpeakerSmall.astro"; import SubtleCard from "~/components/SubtleCard.astro"; import { peopleBySlug } from "~/data/notion-data"; @@ -23,8 +22,13 @@ const excludedSpeakers = new Set([ --- - -
    + + +
      { Object.values(peopleBySlug) .filter((person) => !excludedSpeakers.has(person.slug)) @@ -37,7 +41,6 @@ const excludedSpeakers = new Set([ )) } -