Skip to content

Commit a516671

Browse files
committed
Remove -moz classes from Uppy CSS
1 parent fe6fd26 commit a516671

11 files changed

Lines changed: 86 additions & 156 deletions

File tree

‎src/components/Consent/Checkbox/index.astro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import type { ConsentCheckboxProps } from './@types'
1717
export type Props = ConsentCheckboxProps
1818
19-
import DefaultCheckbox from './default.astro'
20-
import DownloadCheckbox from './download.astro'
21-
import NewsletterCtaArticleCheckbox from './newsletter-cta-article.astro'
22-
import NewsletterCtaHomeCheckbox from './newsletter-cta-home.astro'
19+
import DefaultCheckbox from './layouts/default.astro'
20+
import DownloadCheckbox from './layouts/download.astro'
21+
import NewsletterCtaArticleCheckbox from './layouts/newsletter-cta-article.astro'
22+
import NewsletterCtaHomeCheckbox from './layouts/newsletter-cta-home.astro'
2323
2424
const {
2525
purpose,

src/components/Consent/Checkbox/default.astro renamed to src/components/Consent/Checkbox/layouts/default.astro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* GDPR Consent Component Default Layout
44
*/
55
6-
import type { ConsentCheckboxProps } from './@types'
6+
import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types'
77
88
export type Props = Omit<ConsentCheckboxProps, 'variant'>
99
@@ -34,7 +34,7 @@ const {
3434
aria-labelledby={`${id}-label`}
3535
aria-describedby={`${id}-description`}
3636
aria-invalid="false"
37-
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"
37+
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"
3838
/>
3939
<span id={`${id}-label`} class="sr-only">Consent to data processing</span>
4040
<span id={`${id}-description`} class="flex-1 text-sm leading-relaxed">
@@ -46,7 +46,7 @@ const {
4646
I consent to Webstack Builders processing my personal data for {purpose}. See our{' '}
4747
<a
4848
href={privacyPolicyUrl}
49-
class="text-primary underline hover:text-primary-hover"
49+
class="text-primary underline hover:text-secondary hover:decoration-secondary"
5050
target="_blank"
5151
rel="noopener noreferrer"
5252
>
@@ -55,7 +55,7 @@ const {
5555
and{' '}
5656
<a
5757
href={cookiePolicyUrl}
58-
class="text-primary underline hover:text-primary-hover"
58+
class="text-primary underline hover:text-secondary hover:decoration-secondary"
5959
target="_blank"
6060
rel="noopener noreferrer"
6161
>

src/components/Consent/Checkbox/download.astro renamed to src/components/Consent/Checkbox/layouts/download.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* GDPR Consent Component Download Layout
44
*/
55
6-
import type { ConsentCheckboxProps } from './@types'
6+
import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types'
77
88
export type Props = Omit<ConsentCheckboxProps, 'variant'>
99

src/components/Consent/Checkbox/newsletter-cta-article.astro renamed to src/components/Consent/Checkbox/layouts/newsletter-cta-article.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* GDPR Consent Component Default Layout
44
*/
55
6-
import type { ConsentCheckboxProps } from './@types'
6+
import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types'
77
88
export type Props = Omit<ConsentCheckboxProps, 'variant'>
99

src/components/Consent/Checkbox/newsletter-cta-home.astro renamed to src/components/Consent/Checkbox/layouts/newsletter-cta-home.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* GDPR Consent Component Default Layout
44
*/
55
6-
import type { ConsentCheckboxProps } from './@types'
6+
import type { ConsentCheckboxProps } from '@components/Consent/Checkbox/@types'
77
88
export type Props = Omit<ConsentCheckboxProps, 'variant'>
99

‎src/components/Layout/SubHeader/index.astro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ export type Props = {
1010
const { title, description, icon, subtitle } = Astro.props
1111
---
1212

13-
<header class="text-center max-w-2xl mx-auto mb-8">
13+
<header class="text-center max-w-2xl mx-auto mt-6 mb-8">
1414
<div class="inline-flex items-center justify-center w-18 h-18 rounded-full bg-primary/10 mb-5">
1515
<Icon
1616
icon={icon}
1717
color="page-inverse"
18-
size={12}
18+
size={11}
1919
/>
2020
</div>
2121
<h1 class="text-4xl md:text-5xl font-bold text-page-inverse mb-4">{title}</h1>

‎src/components/List/layouts/ColoredMarkerList.astro‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ const { items, classes, size = 2 }: Props = Astro.props
2020
const ulClass = ["list-none pl-0 text-content mt-4 mb-2 space-y-2", classes?.ul]
2121
const liClass = ["flex items-start", classes?.li]
2222
const emClass = ["mr-2 not-italic font-bold", classes?.em]
23-
const iconClass = [`w-${size} h-${size}`, "rounded-full mt-3 mr-3 shrink-0", classes?.icon]
23+
const markerSizeInRem = `${size * 0.25}rem`
24+
const markerStyle = `width: ${markerSizeInRem}; height: ${markerSizeInRem};`
25+
const iconClass = ["rounded-full mt-2 mr-3 shrink-0", classes?.icon]
2426
const textClass = classes?.text ? [classes.text] : []
2527
---
2628

2729
<ul class:list={ulClass}>
2830
{
2931
items.map((item) => (
3032
<li class:list={liClass}>
31-
<span class:list={[iconClass, item.color]} />
33+
<span class:list={[iconClass, item.color]} style={markerStyle} />
3234
{item.lead && <em class:list={emClass}>{item.lead}</em>}
3335
<span class:list={textClass}>{item.text}</span>
3436
</li>

‎src/components/Pages/Contact/client/feedback.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export const clearFieldFeedback = (
4343
field.input.setAttribute('aria-invalid', 'false')
4444
}
4545

46-
const setOpacity = (label: HTMLLabelElement, hasText: boolean): void => {
47-
label.style.opacity = hasText ? '0' : '0.5'
46+
const setOpacity = (label: HTMLLabelElement, _hasText: boolean): void => {
47+
label.style.removeProperty('opacity')
4848
}
4949

5050
export interface LabelController {

‎src/components/Pages/Contact/index.astro‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ const { content } = Astro.props
9898
---
9999

100100
<contact-form>
101-
<div class="min-h-screen">
101+
<div class="min-h-screen md:mb-16">
102102
{/** Google Maps embed */}
103103
{/* <Map /> */}
104104

105105
{/** Contact Form Section */}
106-
<section class="py-5 bg-page-offset" aria-label="Contact form">
106+
<section class="pt-5 pb-8 bg-page-offset" aria-label="Contact form">
107107
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 mt-4">
108108
<div class="grid grid-cols-1 lg:grid-cols-3 gap-8 lg:gap-12 items-start">
109109
{/** Contact Form */}
@@ -133,13 +133,13 @@ const { content } = Astro.props
133133
</div>
134134

135135
{/** Personal Information */}
136-
<div class="pb-6 border-b border-trim">
136+
<div class="border-b border-trim">
137137
<h3 class="flex items-center text-page-inverse text-xl font-semibold mb-6">
138138
<div class="w-1 h-5 bg-page-inverse rounded-full mr-3"></div>
139139
{content.form.contact.header}
140140
</h3>
141141

142-
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
142+
<div class="grid grid-cols-1 md:grid-cols-2 md:gap-6 md:space-y-6">
143143
<div class="space-y-2">
144144
<label
145145
for="name"
@@ -151,7 +151,7 @@ const { content } = Astro.props
151151
type="text"
152152
id="name"
153153
name="name"
154-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
154+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200"
155155
required
156156
placeholder={content.form.contact.fullNamePlaceholder}
157157
minlength="2"
@@ -179,7 +179,7 @@ const { content } = Astro.props
179179
type="email"
180180
id="email"
181181
name="email"
182-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
182+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200"
183183
required
184184
placeholder={content.form.contact.emailPlaceholder}
185185
aria-invalid="false"
@@ -195,7 +195,7 @@ const { content } = Astro.props
195195
</div>
196196
</div>
197197

198-
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
198+
<div class="grid grid-cols-1 md:grid-cols-2 md:gap-6 md:space-y-6">
199199
<div class="space-y-2">
200200
<label
201201
for="company"
@@ -207,13 +207,13 @@ const { content } = Astro.props
207207
type="text"
208208
id="company"
209209
name="company"
210-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
210+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200"
211211
placeholder={content.form.contact.companyPlaceholder}
212212
maxlength="100"
213213
/>
214214
</div>
215215

216-
<div class="space-y-2">
216+
<div class="space-y-2 mt-2 md:mt-0">
217217
<label
218218
for="phone"
219219
class="block text-content-active text-sm font-medium"
@@ -224,21 +224,21 @@ const { content } = Astro.props
224224
type="tel"
225225
id="phone"
226226
name="phone"
227-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
227+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200"
228228
placeholder={content.form.contact.phonePlaceholder}
229229
/>
230230
</div>
231231
</div>
232232
</div>
233233

234234
{/** Project Information */}
235-
<div class="pb-6 border-b border-trim">
235+
<div class="pb-2 border-b border-trim">
236236
<h3 class="flex items-center text-page-inverse text-xl font-semibold mb-6">
237237
<div class="w-1 h-5 bg-page-inverse rounded-full mr-3"></div>
238238
{content.form.project.header}
239239
</h3>
240240

241-
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
241+
<div class="grid grid-cols-1 md:grid-cols-2 md:gap-6 md:space-y-6">
242242
<div class="space-y-2">
243243
<label
244244
for="project_type"
@@ -249,15 +249,15 @@ const { content } = Astro.props
249249
<select
250250
id="project_type"
251251
name="project_type"
252-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200 cursor-pointer"
252+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200 cursor-pointer"
253253
>
254254
{content.form.project.typeOptions.map((item) => (
255255
<option value={item.value}>{item.text}</option>
256256
))}
257257
</select>
258258
</div>
259259

260-
<div class="space-y-2">
260+
<div class="space-y-2 mt-2 md:mt-0">
261261
<label
262262
for="budget"
263263
class="block text-content-active text-sm font-medium"
@@ -267,8 +267,7 @@ const { content } = Astro.props
267267
<select
268268
id="budget"
269269
name="budget"
270-
required
271-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200 cursor-pointer"
270+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200 cursor-pointer"
272271
>
273272
{content.form.project.budgetOptions.map((item) => (
274273
<option value={item.value}>{item.text}</option>
@@ -277,7 +276,7 @@ const { content } = Astro.props
277276
</div>
278277
</div>
279278

280-
<div class="space-y-2">
279+
<div class="space-y-2 mb-6">
281280
<label
282281
for="timeline"
283282
class="block text-content-active text-sm font-medium"
@@ -287,7 +286,7 @@ const { content } = Astro.props
287286
<select
288287
id="timeline"
289288
name="timeline"
290-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200 cursor-pointer"
289+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200 cursor-pointer"
291290
>
292291
{content.form.project.timelineOptions.map((item) => (
293292
<option value={item.value}>{item.text}</option>
@@ -305,7 +304,7 @@ const { content } = Astro.props
305304
<textarea
306305
id="message"
307306
name="message"
308-
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-content-inverse focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200 resize-vertical min-h-30"
307+
class="w-full px-4 py-3 border-2 border-trim rounded-xl bg-note-inverse/25 focus:border-spotlight focus:ring-0 focus:outline-none focus-visible:border-spotlight focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none transition-colors duration-200 resize-vertical min-h-30"
309308
rows="6"
310309
required
311310
placeholder={content.form.project.descriptionPlaceholder}
@@ -327,16 +326,14 @@ const { content } = Astro.props
327326
</div>
328327

329328
{/** File Upload Section */}
330-
<div class="pb-6">
329+
<div>
331330
<h3 class="flex items-center text-page-inverse text-xl font-semibold mb-4">
332331
<div class="w-1 h-5 bg-page-inverse rounded-full mr-3"></div>
333332
{content.form.files.header}
334333
</h3>
335334
<p class="text-content-active text-sm mb-6">{content.form.files.subheader}</p>
336335

337-
<div
338-
class="border-2 border-dashed border-trim rounded-xl p-8 text-center bg-page-offset hover:border-primary-hover transition-colors duration-200"
339-
>
336+
<div>
340337
<div id="uppyContainer" hidden>
341338
<div id="uppyDashboard"></div>
342339
</div>
@@ -375,7 +372,7 @@ const { content } = Astro.props
375372
<div class="flex justify-end">
376373
<button
377374
type="submit"
378-
class="inline-flex items-center justify-center px-8 py-4 bg-spotlight hover:bg-spotlight-offset text-white font-semibold rounded-xl transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5 disabled:opacity-60 disabled:cursor-not-allowed disabled:transform-none min-w-50"
375+
class="inline-flex items-center justify-center px-8 py-4 bg-page-inverse hover:bg-content-active text-content-inverse font-semibold rounded-xl transition-all duration-200 focus-visible:outline-2 focus-visible:outline-spotlight focus-visible:outline-offset-2 focus-visible:rounded-none disabled:opacity-60 disabled:cursor-not-allowed disabled:transform-none min-w-50"
379376
id="submitBtn"
380377
>
381378
<span class="btn-text">{content.form.submitButtonText}</span>
@@ -467,7 +464,9 @@ const { content } = Astro.props
467464
</div>
468465

469466
<div>
470-
<h3 class="text-page-inverse text-xl font-semibold mb-4">{content.contact.expertise.header}</h3>
467+
<h3 class="text-page-inverse text-xl font-semibold mb-4">
468+
{content.contact.expertise.header}
469+
</h3>
471470
<List
472471
items={content.contact.expertise.areas}
473472
variant="colored-marker-list"
@@ -478,7 +477,9 @@ const { content } = Astro.props
478477
</div>
479478

480479
<div>
481-
<h3 class="text-page-inverse text-xl font-semibold mb-4">{content.contact.chooseUs.header}</h3>
480+
<h3 class="text-page-inverse text-xl font-semibold mb-4">
481+
{content.contact.chooseUs.header}
482+
</h3>
482483
<List
483484
items={content.contact.chooseUs.areas}
484485
variant="colored-marker-list"

0 commit comments

Comments
 (0)