Skip to content

Commit a9d6d2c

Browse files
committed
Add top-level text-content color on body and remove from elements that should inherit in the CSS cascade
1 parent 1065d8f commit a9d6d2c

45 files changed

Lines changed: 172 additions & 171 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/components/Animations/Computers/index.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Icon from '@components/Icon/index.astro'
99
<div class="relative w-full max-w-lg mx-auto">
1010
<button
1111
type="button"
12-
class="absolute bottom-1 right-1 z-10 flex items-center justify-center rounded-full border border-border bg-content-inverse p-1 text-content shadow-lg transition-colors hover:bg-content-inverse-offset"
12+
class="absolute bottom-1 right-1 z-10 flex items-center justify-center rounded-full border border-border bg-content-inverse p-1 shadow-lg transition-colors hover:bg-content-inverse-offset"
1313
data-animation-toggle
1414
aria-label="Pause animation"
1515
aria-pressed="false"

‎src/components/BugReporter/index.astro‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ const {
2929
<dialog
3030
id={dialogId}
3131
aria-label="Report a bug"
32-
class="bg-content-inverse text-content border border-border rounded-md p-4 max-w-xl w-[min(42rem,90vw)]"
32+
class="bg-content-inverse border border-border rounded-md p-4 max-w-xl w-[min(42rem,90vw)]"
3333
>
3434
<div class="flex items-start justify-between gap-4">
3535
<h2 class="text-xl font-bold">Report a bug</h2>
3636
<button
3737
id={closeButtonId}
3838
type="button"
39-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
39+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
4040
>
4141
Close
4242
</button>
@@ -52,7 +52,7 @@ const {
5252
<input
5353
name="name"
5454
autocomplete="name"
55-
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset text-content p-2"
55+
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset p-2"
5656
placeholder="Your name"
5757
/>
5858
</label>
@@ -63,7 +63,7 @@ const {
6363
name="email"
6464
type="email"
6565
autocomplete="email"
66-
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset text-content p-2"
66+
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset p-2"
6767
placeholder="your.email@example.org"
6868
/>
6969
</label>
@@ -74,12 +74,12 @@ const {
7474
name="message"
7575
required
7676
rows="5"
77-
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset text-content p-2"
77+
class="mt-1 w-full rounded-md border border-border bg-content-inverse-offset p-2"
7878
placeholder="What's the bug? What did you expect?"
7979
></textarea>
8080
</label>
8181

82-
<p id={statusId} class="mt-3 text-content hidden" aria-live="polite"></p>
82+
<p id={statusId} class="mt-3 hidden" aria-live="polite"></p>
8383

8484
<div class="mt-4 flex items-center gap-3">
8585
<button
@@ -92,7 +92,7 @@ const {
9292
<button
9393
id={cancelButtonId}
9494
type="button"
95-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
95+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
9696
>
9797
Cancel
9898
</button>

‎src/components/CallToAction/Newsletter/index.astro‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const {
5454
></path>
5555
</svg>
5656
</div>
57-
<h2 class="text-2xl md:text-3xl lg:text-4xl font-bold text-content mb-4">
57+
<h2 class="text-2xl md:text-3xl lg:text-4xl font-bold mb-4">
5858
{title}
5959
</h2>
6060
<p class="text-base md:text-lg text-content-active max-w-2xl mx-auto leading-relaxed">
@@ -70,7 +70,7 @@ const {
7070
<label
7171
id="newsletter-email-label"
7272
for="newsletter-email"
73-
class="text-sm font-medium text-content"
73+
class="text-sm font-medium"
7474
>
7575
Email address
7676
</label>
@@ -79,7 +79,7 @@ const {
7979
id="newsletter-email"
8080
name="email"
8181
placeholder={placeholder}
82-
class="w-full px-6 py-4 border-2 border-border rounded-xl bg-content-inverse text-content placeholder:text-content-active focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
82+
class="w-full px-6 py-4 border-2 border-border rounded-xl bg-content-inverse placeholder:text-content-active focus:border-primary focus:ring-0 focus:outline-none transition-colors duration-200"
8383
required
8484
aria-describedby="newsletter-message"
8585
/>

‎src/components/Carousel/index.astro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const carouselId = `carousel-${type}-${variant}-${currentSlug}`
3535
<carousel-slider data-carousel class="block">
3636
<section class="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-16">
3737
<header class="text-center mb-12">
38-
<h2 id={`${carouselId}-title`} class="text-3xl md:text-4xl font-bold text-content">
38+
<h2 id={`${carouselId}-title`} class="text-3xl md:text-4xl font-bold">
3939
{title}
4040
</h2>
4141
</header>
@@ -71,7 +71,7 @@ const carouselId = `carousel-${type}-${variant}-${currentSlug}`
7171
</div>
7272
)}
7373
<div class="p-6 pt-2">
74-
<h3 class="text-xl font-semibold text-content mb-3 group-hover:text-primary transition-colors">
74+
<h3 class="text-xl font-semibold mb-3 group-hover:text-primary transition-colors">
7575
{item.data.title}
7676
</h3>
7777
{item.data.description && (
@@ -111,7 +111,7 @@ const carouselId = `carousel-${type}-${variant}-${currentSlug}`
111111
data-carousel-prev
112112
>
113113
<svg
114-
class="w-6 h-6 text-content"
114+
class="w-6 h-6"
115115
fill="none"
116116
stroke="currentColor"
117117
viewBox="0 0 24 24"
@@ -134,7 +134,7 @@ const carouselId = `carousel-${type}-${variant}-${currentSlug}`
134134
data-carousel-next
135135
>
136136
<svg
137-
class="w-6 h-6 text-content"
137+
class="w-6 h-6"
138138
fill="none"
139139
stroke="currentColor"
140140
viewBox="0 0 24 24"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import CookieSvg from '@assets/images/site/cookie.svg'
2121
<button
2222
type="button"
2323
aria-label="Close cookie consent"
24-
class="consent-modal__close-btn bg-spotlight border-none text-content flex p-1.5 absolute top-0 right-0 transition-all duration-150 ease-in-out hover:bg-spotlight-offset hover:text-content focus:bg-spotlight-offset focus:text-content focus:outline-none z-10"
24+
class="consent-modal__close-btn bg-spotlight border-none flex p-1.5 absolute top-0 right-0 transition-all duration-150 ease-in-out hover:bg-spotlight-offset focus:bg-spotlight-offset focus:outline-none z-10"
2525
>
2626
<Icon name="close" class="h-8 w-8" />
2727
</button>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
class="border-2 border-border 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"
4848
/>
4949
<span id={`${id}-label`} class="sr-only">Consent to data processing</span>
50-
<span id={`${id}-description`} class="flex-1 text-sm leading-relaxed text-content">
50+
<span id={`${id}-description`} class="flex-1 text-sm leading-relaxed">
5151
{
5252
customText ? (
5353
<Fragment set:html={customText} />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import logoSvg from '@assets/images/site/logo.svg'
1212
<div class="px-6 py-4 flex items-center justify-between border-b border-page-base-offset">
1313
<div class="flex items-center gap-4">
1414
<Image src={logoSvg} alt="Webstack Builders corporate logo." class="h-8 w-auto" />
15-
<h2 id="consent-preferences__title" class="text-2xl font-bold text-content">
15+
<h2 id="consent-preferences__title" class="text-2xl font-bold">
1616
Privacy Preference Center
1717
</h2>
1818
</div>
@@ -203,7 +203,7 @@ import logoSvg from '@assets/images/site/logo.svg'
203203
<div class="bg-content-inverse border-t border-page-base-offset px-6 py-4 flex gap-3 justify-end flex-wrap">
204204
<button
205205
id="consent-deny-all"
206-
class="px-6 py-2 bg-spotlight text-content rounded-lg hover:bg-spotlight-offset transition-colors duration-200 font-medium"
206+
class="px-6 py-2 bg-spotlight rounded-lg hover:bg-spotlight-offset transition-colors duration-200 font-medium"
207207
>
208208
Decline All
209209
</button>

‎src/components/Errors/NotFoundHero/index.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const {
1818

1919
<div class="mb-8 text-center">
2020
<h1 class="text-9xl font-bold text-content-muted mb-4">{heading}</h1>
21-
<h2 class="text-3xl md:text-4xl font-bold text-content mb-4">{subheading}</h2>
21+
<h2 class="text-3xl md:text-4xl font-bold mb-4">{subheading}</h2>
2222
<p class="text-lg text-content-muted mb-8">
2323
{description}
2424
</p>

‎src/components/Footer/index.astro‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const year = new Date().getFullYear()
1111
---
1212

1313
<site-footer transition:persist>
14-
<footer class="bg-content-inverse-offset text-content w-full mt-6 pt-4" role="contentinfo">
14+
<footer class="bg-content-inverse-offset w-full mt-6 pt-4" role="contentinfo">
1515
<div
1616
class:list={[
1717
styles.footerGrid,
@@ -40,7 +40,7 @@ const year = new Date().getFullYear()
4040
<p class="hyphens-none">
4141
<a
4242
href={`mailto:${contactData.company.email}`}
43-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
43+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
4444
>
4545
{contactData.company.email}
4646
</a>
@@ -49,7 +49,7 @@ const year = new Date().getFullYear()
4949
<a
5050
href={`tel:${contactData.company.telephoneTollFree}`}
5151
rel="nofollow"
52-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
52+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
5353
>
5454
Toll Free {formatPhoneNumber(contactData.company.telephoneTollFree)}
5555
</a>
@@ -58,7 +58,7 @@ const year = new Date().getFullYear()
5858
<a
5959
href={`tel:${contactData.company.telephoneLocal}`}
6060
rel="nofollow"
61-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
61+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
6262
>
6363
Local {formatPhoneNumber(contactData.company.telephoneLocal)}
6464
</a>
@@ -72,7 +72,7 @@ const year = new Date().getFullYear()
7272
id="page-footer__hire-me-anchor"
7373
class:list={[
7474
styles.footerHireMeAnchor,
75-
"hidden uppercase text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none after:content-['>']",
75+
"hidden uppercase underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none after:content-['>']",
7676
]}
7777
aria-label="Available Now. Hire Me"
7878
>
@@ -91,7 +91,7 @@ const year = new Date().getFullYear()
9191
href={social.url}
9292
title={social.displayName}
9393
rel="me"
94-
class="flex items-baseline uppercase text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none [&_.icon]:fill-content! [&_.icon]:stroke-text! hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary!"
94+
class="flex items-baseline uppercase underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none [&_.icon]:fill-content! [&_.icon]:stroke-text! hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary!"
9595
>
9696
<span class="[&_.icon]:h-4 [&_.icon]:w-4">
9797
<Icon name={social.iconName} variant="inherit" />
@@ -114,11 +114,11 @@ const year = new Date().getFullYear()
114114
<span class="flex flex-col justify-center lg:pt-3">
115115
<a
116116
href="/#newsletter"
117-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
117+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
118118
>
119119
<div class="lg:hidden">Subscribe to</div>
120120
<span class="lg:font-bold lg:uppercase">Mailing List</span>
121-
<span class="hidden lg:block text-content">
121+
<span class="hidden lg:block">
122122
Sign up to stay in touch and get great content
123123
</span>
124124
</a>
@@ -128,21 +128,21 @@ const year = new Date().getFullYear()
128128
<span>
129129
<a
130130
href="/consent"
131-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
131+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
132132
>
133133
<span class="lg:font-bold lg:uppercase">Consent</span>
134-
<span class="hidden lg:block text-content">
134+
<span class="hidden lg:block">
135135
Manage your privacy preferences and data consent
136136
</span>
137137
</a>
138138
</span>
139139
<span>
140140
<a
141141
href="/privacy"
142-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
142+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
143143
>
144144
<span class="lg:font-bold lg:uppercase">Privacy Policy</span>
145-
<span class="hidden lg:block text-content">
145+
<span class="hidden lg:block">
146146
Learn what data we collect and how we use it
147147
</span>
148148
</a>
@@ -153,7 +153,7 @@ const year = new Date().getFullYear()
153153
<a
154154
href={`${getSiteUrl()}/rss.xml`}
155155
title="RSS Feed"
156-
class="text-content [&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
156+
class="[&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
157157
>
158158
<span class="sr-only">RSS Feed</span>
159159
<span><Icon name="feed" variant="inherit" /></span>
@@ -169,7 +169,7 @@ const year = new Date().getFullYear()
169169
<a
170170
rel="me"
171171
href={getSiteUrl()}
172-
class="text-content underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
172+
class="underline decoration-dotted decoration-content underline-offset-4 hover:text-secondary hover:decoration-secondary focus:text-secondary focus:decoration-secondary focus:outline-none"
173173
>
174174
{contactData.company.name}
175175
</a>
@@ -180,7 +180,7 @@ const year = new Date().getFullYear()
180180
<a
181181
href={`${getSiteUrl()}/rss.xml`}
182182
title="RSS Feed"
183-
class="text-content [&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
183+
class="[&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
184184
>
185185
<span class="sr-only">RSS Feed</span>
186186
<span><Icon name="feed" variant="inherit" /></span>
@@ -193,7 +193,7 @@ const year = new Date().getFullYear()
193193
id="bugReporterTrigger"
194194
type="button"
195195
title="Report a bug"
196-
class="text-content [&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
196+
class="[&_.icon]:fill-content! [&_.icon]:stroke-text! [&_.icon]:h-10 [&_.icon]:w-10 hover:[&_.icon]:fill-secondary! hover:[&_.icon]:stroke-secondary! focus:[&_.icon]:fill-secondary! focus:[&_.icon]:stroke-secondary! focus:outline-none"
197197
>
198198
<span class="sr-only">Report a bug</span>
199199
<span><Icon name="bug" variant="inherit" /></span>

0 commit comments

Comments
 (0)