From 97075cb9ee4e68e2ddb4a45a082d288134c4c331 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Wed, 7 May 2025 13:12:54 +0200 Subject: [PATCH 1/3] Add .typography-link utility --- .../2025/components/call-for-proposals.tsx | 19 ++++++++------ .../components/register-section/index.tsx | 4 +-- tailwind.config.ts | 25 +++++++++++++------ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/app/conf/2025/components/call-for-proposals.tsx b/src/app/conf/2025/components/call-for-proposals.tsx index f6784b0764..8d4471642d 100644 --- a/src/app/conf/2025/components/call-for-proposals.tsx +++ b/src/app/conf/2025/components/call-for-proposals.tsx @@ -102,14 +102,14 @@ function NotesTab() {
  • All speakers are required to adhere to our{" "} Code of Conduct . We also highly recommend that speakers take our online{" "} @@ -169,7 +169,7 @@ function NotesTab() { Getting Over Your Imposter Syndrome to Become a Conference Speaker @@ -183,8 +183,13 @@ function NotesTab() { community and share your ideas and the work that you are doing and we strongly encourage first-time speakers to submit talks for our events. In the instance that you aren't sure about your abstract,{" "} - reach out to us and we will - be more than happy to work with you on your proposal. + + reach out to us + {" "} + and we will be more than happy to work with you on your proposal.

    ) @@ -337,7 +342,7 @@ export function CallForProposals() { For any questions regarding the CFP process, please email{" "} cfp@linuxfoundation.org @@ -351,7 +356,7 @@ export function CallForProposals() { how to submit your session {" "} diff --git a/src/app/conf/2025/components/register-section/index.tsx b/src/app/conf/2025/components/register-section/index.tsx index 8c66406f92..a2602d23a0 100644 --- a/src/app/conf/2025/components/register-section/index.tsx +++ b/src/app/conf/2025/components/register-section/index.tsx @@ -36,7 +36,7 @@ export function RegisterSection({ className, ...props }: RegisterSectionProps) { email. If you did not, please contact us for more details:{" "} cfp@linuxfoundation.org @@ -57,7 +57,7 @@ export function RegisterSection({ className, ...props }: RegisterSectionProps) { register as a Sponsor. For further questions, please email us:{" "} graphql_events@linuxfoundation.org diff --git a/tailwind.config.ts b/tailwind.config.ts index ebad1e3238..fdb8460ae9 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -79,7 +79,8 @@ const config: Config = { typography, containerQueries, plugin(({ addUtilities }) => { - const headingStyles = { + // heading styles + addUtilities({ ".typography-d1, .typography-h1, .typography-h2, .typography-h3": { lineHeight: "1.2", }, @@ -107,9 +108,10 @@ const config: Config = { fontSize: "32px", }, }, - } + }) - const bodyStyles = { + // paragraph styles + addUtilities({ ".typography-body-lg, .typography-body-md, .typography-body-sm, .typography-body-xs": { lineHeight: "1.5", @@ -138,9 +140,10 @@ const config: Config = { fontSize: "12px", }, }, - } + }) - const specialStyles = { + // other text styles + addUtilities({ ".typography-button, .typography-tagline": { fontSize: "16px", lineHeight: "1", @@ -154,9 +157,17 @@ const config: Config = { lineHeight: "1", textTransform: "uppercase", }, - } + }) - addUtilities({ ...headingStyles, ...bodyStyles, ...specialStyles }) + addUtilities({ + ".typography-link": { + color: "theme('colors.neu-800')", + textDecoration: "underline", + "&:hover": { + textDecoration: "none", + }, + }, + }) }), ], darkMode: ["class", 'html[class~="dark"]'], From f02232e836f4c4425b49052d46a53b11a5d2b1f6 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Wed, 7 May 2025 13:35:46 +0200 Subject: [PATCH 2/3] Add FrequentlyAskedQuestions section --- src/app/conf/2025/faq.tsx | 249 ++++++++++++++++++++++------- src/app/conf/2025/index.module.css | 6 - src/app/conf/2025/page.tsx | 2 + 3 files changed, 192 insertions(+), 65 deletions(-) delete mode 100644 src/app/conf/2025/index.module.css diff --git a/src/app/conf/2025/faq.tsx b/src/app/conf/2025/faq.tsx index 95bdc0c072..169a76fe42 100644 --- a/src/app/conf/2025/faq.tsx +++ b/src/app/conf/2025/faq.tsx @@ -1,101 +1,232 @@ -import { ArrowRight } from "lucide-react" - -import styles from "./index.module.css" +import clsx from "clsx" +import ArrowDown from "./pixelarticons/arrow-down.svg?svgr" const FAQS = [ { question: "When will speakers and the agenda be announced?", - answer: - "Stay tuned to our social media channels and website for updates on speakers and the agenda.", + answer: ( + <> + Stay tuned to our social media channels and website for updates on + speakers and the agenda. + + ), }, { question: "Can I sponsor the event?", - answer: - 'Yes! We offer various sponsorship packages. See this section for more information.', + answer: ( + <> + Yes! We offer various sponsorship packages. See the{" "} + + Sponsors + {" "} + section for more information. + + ), }, { question: "Are there group discounts for teams?", - answer: - 'If you have a group of 5 or more people, you can receive a 10% discount on all passes. All pass types must be the same, and all registrations must be processed under one group registration and must be paid with the same credit card. To create a group, select “Add Another Person” to your registration. When 5 or more people are added the 10% discount will be automatically applied. registration@linuxfoundation.org for any questions.', + answer: ( + <> + If you have a group of 5 or more people, you can receive a 10% discount + on all passes. All pass types must be the same, and all registrations + must be processed under one group registration and must be paid with the + same credit card. To create a group, select “Add Another Person” to your + registration. When 5 or more people are added the 10% discount will be + automatically applied.{" "} + + registration@linuxfoundation.org + {" "} + for any questions. + + ), }, { question: "What is the refund and cancellation policy?", - answer: `If you must cancel for any reason, please sign back into your registration, click the “Register/Modify” button and select “Unregister.” If you need further assistance, please contact registration@linuxfoundation.org.

    Refunds will only be issued for cancellations received two weeks prior to the event start date, including bulk ticket request refunds, and will appear as a credit on the card's statement 7-10 business days after cancellation. Individual refund requests for late cancellations due to sickness or emergency will be considered on a case by case basis - registration@linuxfoundation.org.

    Refunds can only be issued on the card the original payment was made.`, + answer: ( + <> + If you must cancel for any reason, please sign back into your + registration, click the “Register/Modify” button and select + “Unregister.” If you need further assistance, please contact{" "} + + registration@linuxfoundation.org + + .
    +
    + Refunds will only be issued for cancellations received two weeks prior + to the event start date, including bulk ticket request refunds, and will + appear as a credit on the card's statement 7-10 business days after + cancellation. Individual refund requests for late cancellations due to + sickness or emergency will be considered on a case by case basis -{" "} + + registration@linuxfoundation.org + + .
    +
    + Refunds can only be issued on the card the original payment was made. + + ), }, { question: "Can I transfer my registration?", - answer: - "If you are unable to attend, you may substitute another attendee in lieu of cancellation. To substitute an attendee, sign back into your registration, click the “Register/Modify”, and select “Transfer Registration” on your confirmation page.", + answer: ( + <> + If you are unable to attend, you may substitute another attendee in lieu + of cancellation. To substitute an attendee, sign back into your + registration, click the “Register/Modify”, and select “Transfer + Registration” on your confirmation page. + + ), }, { question: "Can I get certificate of attendance?", - answer: `You can download your Certificate of Attendance directly from your LFX dashboard by navigating to the "Past Events" section in the LF Events column. Please Note: We verify attendance through the registration system, and certificates will only be available for download after the event is completed.`, + answer: ( + <> + You can download your Certificate of Attendance directly from your{" "} + + LFX dashboard + {" "} + by navigating to the "Past Events" section in the LF Events column. + Please Note: We verify attendance through the registration system, and + certificates will only be available for download after the event is + completed. + + ), }, { question: "How do I request a visa letter?", - answer: `You must be registered for the event before requesting a visa letter. Please note: it can take up to an hour for our registration system and visa letter system to sync. Request a visa letter.`, + answer: ( + <> + You must be registered for the event before requesting a visa letter. + Please note: it can take up to an hour for our registration system and + visa letter system to sync.{" "} + + Request a visa letter + + . + + ), }, { question: "Where can I find health and safety information for the event?", - answer: - 'Your well-being is our top priority. We continuously update our health and safety guidelines based on local regulations. Information about food allergies, medical resources, emergency contacts, and safety services can be found on this page.', + answer: ( + <> + Your well-being is our top priority. We continuously update our health + and safety guidelines based on local regulations. Information about food + allergies, medical resources, emergency contacts, and safety services + can be found on{" "} + + this + {" "} + page. + + ), }, { question: "What accessibility and onsite resources are available?", - answer: - 'We are committed to providing a comfortable and accessible experience for all attendees. Onsite resources include a private nursing room, venue accessibility support, reserved seating, a quiet room, communication and pronoun stickers, all-gender restrooms, first aid assistance, and a process for handling harassment reports. For full details on these resources, please visit this page.', + answer: ( + <> + We are committed to providing a comfortable and accessible experience + for all attendees. Onsite resources include a private nursing room, + venue accessibility support, reserved seating, a quiet room, + communication and pronoun stickers, all-gender restrooms, first aid + assistance, and a process for handling harassment reports. For full + details on these resources, please visit{" "} + + this + {" "} + page. + + ), }, { question: "Looking for more?", - answer: "Checkout our Resources page.", + answer: ( + <> + Checkout our{" "} + + Resources + {" "} + page. + + ), }, { question: "Cannot find the answer to your question?", - answer: - 'You are welcome to email us graphql_events@linuxfoundation.org.', + answer: ( + <> + You are welcome to email us{" "} + + graphql_events@linuxfoundation.org + + . + + ), }, ] -export function FAQ() { +export function FAQ({ className }: { className?: string }) { return ( -
    -
    -
    -

    - Frequently -
    - Asked Questions -

    -

    - You can find much more information on our{" "} - - Resources - {" "} - page. -

    -
    +
    +
    +

    Frequently Asked Questions

    +

    + You can find much more information on our{" "} + + Resources + {" "} + page. +

    +
    -
    - {FAQS.map((faq, index) => ( -
    - - - {faq.question} - -

    -

    - ))} -
    +
    + {FAQS.map((faq, index) => ( +
    + + + {faq.question} + + + +

    {faq.answer}

    +
    + ))}
    -
    + ) } diff --git a/src/app/conf/2025/index.module.css b/src/app/conf/2025/index.module.css deleted file mode 100644 index b950c3d318..0000000000 --- a/src/app/conf/2025/index.module.css +++ /dev/null @@ -1,6 +0,0 @@ -.faq { - /* Safari specific style - we are using icon for consistency */ - details summary::-webkit-details-marker { - display: none; - } -} diff --git a/src/app/conf/2025/page.tsx b/src/app/conf/2025/page.tsx index a7ff5277a4..82f9ab77b5 100644 --- a/src/app/conf/2025/page.tsx +++ b/src/app/conf/2025/page.tsx @@ -37,6 +37,8 @@ export default function Page() { +
    +
    From f37ec2cc330255d274fd914e1628ab4dbfa825f1 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Wed, 7 May 2025 14:12:32 +0200 Subject: [PATCH 3/3] Tweak spacing --- src/app/conf/2025/faq.tsx | 19 ++++++++++++------- .../conf/2025/pixelarticons/chevron-right.tsx | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/app/conf/2025/faq.tsx b/src/app/conf/2025/faq.tsx index 169a76fe42..90e55d3c9b 100644 --- a/src/app/conf/2025/faq.tsx +++ b/src/app/conf/2025/faq.tsx @@ -30,9 +30,12 @@ const FAQS = [ If you have a group of 5 or more people, you can receive a 10% discount on all passes. All pass types must be the same, and all registrations must be processed under one group registration and must be paid with the - same credit card. To create a group, select “Add Another Person” to your - registration. When 5 or more people are added the 10% discount will be - automatically applied.{" "} + same credit card. +
    +
    + To create a group, select “Add Another Person” to your registration. + When 5 or more people are added the 10% discount will be automatically + applied.{" "} {" "} by navigating to the "Past Events" section in the LF Events column. +
    +
    Please Note: We verify attendance through the registration system, and certificates will only be available for download after the event is completed. @@ -165,7 +170,7 @@ const FAQS = [ question: "Looking for more?", answer: ( <> - Checkout our{" "} + Check out our{" "}     Resources {" "} @@ -210,12 +215,12 @@ export function FAQ({ className }: { className?: string }) {

    -
    +
    {FAQS.map((faq, index) => (
    @@ -223,7 +228,7 @@ export function FAQ({ className }: { className?: string }) { -

    {faq.answer}

    +
    {faq.answer}
    ))}
    diff --git a/src/app/conf/2025/pixelarticons/chevron-right.tsx b/src/app/conf/2025/pixelarticons/chevron-right.tsx index 180cbc0c4d..698c7d5917 100644 --- a/src/app/conf/2025/pixelarticons/chevron-right.tsx +++ b/src/app/conf/2025/pixelarticons/chevron-right.tsx @@ -8,8 +8,8 @@ export function ChevronRight(props: React.SVGProps) { {...props} >