From a5166716680868403e733442020ff9f76507d792 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Sat, 21 Feb 2026 16:17:35 +0300 Subject: [PATCH 01/18] Remove -moz classes from Uppy CSS --- src/components/Consent/Checkbox/index.astro | 8 +- .../Checkbox/{ => layouts}/default.astro | 8 +- .../Checkbox/{ => layouts}/download.astro | 2 +- .../newsletter-cta-article.astro | 2 +- .../{ => layouts}/newsletter-cta-home.astro | 2 +- src/components/Layout/SubHeader/index.astro | 4 +- .../List/layouts/ColoredMarkerList.astro | 6 +- .../Pages/Contact/client/feedback.ts | 4 +- src/components/Pages/Contact/index.astro | 53 +++---- .../Pages/Contact/uppy-dashboard.css | 145 +++++------------- src/pages/contact/index.astro | 8 +- 11 files changed, 86 insertions(+), 156 deletions(-) rename src/components/Consent/Checkbox/{ => layouts}/default.astro (67%) rename src/components/Consent/Checkbox/{ => layouts}/download.astro (96%) rename src/components/Consent/Checkbox/{ => layouts}/newsletter-cta-article.astro (97%) rename src/components/Consent/Checkbox/{ => layouts}/newsletter-cta-home.astro (96%) diff --git a/src/components/Consent/Checkbox/index.astro b/src/components/Consent/Checkbox/index.astro index f585e668f..7af66f1b9 100644 --- a/src/components/Consent/Checkbox/index.astro +++ b/src/components/Consent/Checkbox/index.astro @@ -16,10 +16,10 @@ import type { ConsentCheckboxProps } from './@types' export type Props = ConsentCheckboxProps -import DefaultCheckbox from './default.astro' -import DownloadCheckbox from './download.astro' -import NewsletterCtaArticleCheckbox from './newsletter-cta-article.astro' -import NewsletterCtaHomeCheckbox from './newsletter-cta-home.astro' +import DefaultCheckbox from './layouts/default.astro' +import DownloadCheckbox from './layouts/download.astro' +import NewsletterCtaArticleCheckbox from './layouts/newsletter-cta-article.astro' +import NewsletterCtaHomeCheckbox from './layouts/newsletter-cta-home.astro' const { purpose, diff --git a/src/components/Consent/Checkbox/default.astro b/src/components/Consent/Checkbox/layouts/default.astro similarity index 67% rename from src/components/Consent/Checkbox/default.astro rename to src/components/Consent/Checkbox/layouts/default.astro index 5fc852d14..3398f9510 100644 --- a/src/components/Consent/Checkbox/default.astro +++ b/src/components/Consent/Checkbox/layouts/default.astro @@ -3,7 +3,7 @@ * GDPR Consent Component Default Layout */ -import type { ConsentCheckboxProps } from './@types' +import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types' export type Props = Omit @@ -34,7 +34,7 @@ const { aria-labelledby={`${id}-label`} aria-describedby={`${id}-description`} aria-invalid="false" - class="border-2 border-trim rounded mt-0.5 h-5 w-5 shrink-0 cursor-pointer focus:outline-2 focus:outline-offset-2 focus:outline-primary checked:bg-spotlight checked:border-primary" + class="relative mt-1 h-5 w-5 shrink-0 appearance-none rounded border-2 border-content-active bg-transparent outline-none hover:border-primary hover:bg-primary-offset/10 focus:outline-none focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 checked:border-primary checked:bg-spotlight checked:after:content-[''] checked:after:absolute checked:after:inset-1 checked:after:rounded-xs checked:after:bg-content-inverse after:pointer-events-none after:absolute after:inset-0 after:rounded-none after:border-2 after:border-transparent focus-visible:after:-inset-1 focus-visible:after:border-spotlight cursor-pointer" /> Consent to data processing @@ -46,7 +46,7 @@ const { I consent to Webstack Builders processing my personal data for {purpose}. See our{' '} @@ -55,7 +55,7 @@ const { and{' '} diff --git a/src/components/Consent/Checkbox/download.astro b/src/components/Consent/Checkbox/layouts/download.astro similarity index 96% rename from src/components/Consent/Checkbox/download.astro rename to src/components/Consent/Checkbox/layouts/download.astro index 3c68ec299..a894a9539 100644 --- a/src/components/Consent/Checkbox/download.astro +++ b/src/components/Consent/Checkbox/layouts/download.astro @@ -3,7 +3,7 @@ * GDPR Consent Component Download Layout */ -import type { ConsentCheckboxProps } from './@types' +import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types' export type Props = Omit diff --git a/src/components/Consent/Checkbox/newsletter-cta-article.astro b/src/components/Consent/Checkbox/layouts/newsletter-cta-article.astro similarity index 97% rename from src/components/Consent/Checkbox/newsletter-cta-article.astro rename to src/components/Consent/Checkbox/layouts/newsletter-cta-article.astro index 86b34fbad..1de1e4443 100644 --- a/src/components/Consent/Checkbox/newsletter-cta-article.astro +++ b/src/components/Consent/Checkbox/layouts/newsletter-cta-article.astro @@ -3,7 +3,7 @@ * GDPR Consent Component Default Layout */ -import type { ConsentCheckboxProps } from './@types' +import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types' export type Props = Omit diff --git a/src/components/Consent/Checkbox/newsletter-cta-home.astro b/src/components/Consent/Checkbox/layouts/newsletter-cta-home.astro similarity index 96% rename from src/components/Consent/Checkbox/newsletter-cta-home.astro rename to src/components/Consent/Checkbox/layouts/newsletter-cta-home.astro index ee4cfc3d7..8bfecb693 100644 --- a/src/components/Consent/Checkbox/newsletter-cta-home.astro +++ b/src/components/Consent/Checkbox/layouts/newsletter-cta-home.astro @@ -3,7 +3,7 @@ * GDPR Consent Component Default Layout */ -import type { ConsentCheckboxProps } from './@types' +import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types' export type Props = Omit diff --git a/src/components/Layout/SubHeader/index.astro b/src/components/Layout/SubHeader/index.astro index 6bd1f1958..e840721d4 100644 --- a/src/components/Layout/SubHeader/index.astro +++ b/src/components/Layout/SubHeader/index.astro @@ -10,12 +10,12 @@ export type Props = { const { title, description, icon, subtitle } = Astro.props --- -
+

{title}

diff --git a/src/components/List/layouts/ColoredMarkerList.astro b/src/components/List/layouts/ColoredMarkerList.astro index 438b266ea..a4e096f42 100644 --- a/src/components/List/layouts/ColoredMarkerList.astro +++ b/src/components/List/layouts/ColoredMarkerList.astro @@ -20,7 +20,9 @@ const { items, classes, size = 2 }: Props = Astro.props const ulClass = ["list-none pl-0 text-content mt-4 mb-2 space-y-2", classes?.ul] const liClass = ["flex items-start", classes?.li] const emClass = ["mr-2 not-italic font-bold", classes?.em] -const iconClass = [`w-${size} h-${size}`, "rounded-full mt-3 mr-3 shrink-0", classes?.icon] +const markerSizeInRem = `${size * 0.25}rem` +const markerStyle = `width: ${markerSizeInRem}; height: ${markerSizeInRem};` +const iconClass = ["rounded-full mt-2 mr-3 shrink-0", classes?.icon] const textClass = classes?.text ? [classes.text] : [] --- @@ -28,7 +30,7 @@ const textClass = classes?.text ? [classes.text] : [] { items.map((item) => (
  • - + {item.lead && {item.lead}} {item.text}
    • diff --git a/src/components/Pages/Contact/client/feedback.ts b/src/components/Pages/Contact/client/feedback.ts index 8c459691a..5f71d4070 100644 --- a/src/components/Pages/Contact/client/feedback.ts +++ b/src/components/Pages/Contact/client/feedback.ts @@ -43,8 +43,8 @@ export const clearFieldFeedback = ( field.input.setAttribute('aria-invalid', 'false') } -const setOpacity = (label: HTMLLabelElement, hasText: boolean): void => { - label.style.opacity = hasText ? '0' : '0.5' +const setOpacity = (label: HTMLLabelElement, _hasText: boolean): void => { + label.style.removeProperty('opacity') } export interface LabelController { diff --git a/src/components/Pages/Contact/index.astro b/src/components/Pages/Contact/index.astro index edf857f74..0488c83b3 100644 --- a/src/components/Pages/Contact/index.astro +++ b/src/components/Pages/Contact/index.astro @@ -98,12 +98,12 @@ const { content } = Astro.props --- -
    +
    {/** Google Maps embed */} {/* */} {/** Contact Form Section */} -
    +
    {/** Contact Form */} @@ -133,13 +133,13 @@ const { content } = Astro.props
    {/** Personal Information */} -
    +

    {content.form.contact.header}

    -
    +
    -
    +
    -
    +
    @@ -232,13 +232,13 @@ const { content } = Astro.props
    {/** Project Information */} -
    +

    {content.form.project.header}

    -
    +
    -
    +
    -
    +