Skip to content

Commit 5af4827

Browse files
committed
Merge branch 'main' into 2.0.0-next
2 parents 0fd8aad + 32a31dd commit 5af4827

File tree

6 files changed

+11
-387
lines changed

6 files changed

+11
-387
lines changed

apps/website/app/(home)/page.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { EffectLayer } from "#/components/EffectLayer";
21
import { ESLintReact } from "#/components/ESLintReact";
32
import { Card, Cards } from "fumadocs-ui/components/card";
43
import { CircleDotDashed, Gauge, Sliders, Zap } from "lucide-react";
@@ -18,26 +17,24 @@ const features = [
1817
export default function HomePage() {
1918
return (
2019
<main className="w-full min-w-0 max-w-6xl px-8 pt-4 pb-12 md:px-12 mx-auto">
21-
<EffectLayer />
2220
<ESLintReact />
23-
<article className="prose max-w-none isolate dark:isolation-auto">
24-
<h2 className="isolate">Features</h2>
21+
<article className="prose max-w-none">
22+
<h2>Features</h2>
2523
<Cards className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
2624
{features.map(([title, description, Icon]) => (
2725
<Card
28-
className="mix-blend-luminosity shadow-none"
2926
description={description}
3027
icon={<Icon />}
3128
key={title}
3229
title={title}
3330
/>
3431
))}
3532
</Cards>
36-
<h2 className="isolate">Roadmap</h2>
33+
<h2>Roadmap</h2>
3734
<p>
3835
Check out the <Link href="/roadmap">roadmap</Link> to see what's planned for the future.
3936
</p>
40-
<h2 className="isolate">Contributing</h2>
37+
<h2>Contributing</h2>
4138
<p>
4239
Want to contribute? Check out the{" "}
4340
<Link href="https://github.com/Rel1cx/eslint-react/blob/main/.github/CONTRIBUTING.md">

apps/website/app/theme.css

Lines changed: 6 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,48 @@
1-
/* =============================================================================
2-
Base Theme Variables - Light Mode (Default)
3-
========================================================================== */
4-
51
@theme {
6-
/* Primary UI Colors */
72
--color-fd-background: hsl(0, 0%, 100%);
83
--color-fd-foreground: hsl(240, 6%, 25%);
9-
10-
/* Component Colors */
114
--color-fd-card: hsl(0, 0%, 100%);
125
--color-fd-card-foreground: hsl(0, 0%, 3.9%);
136
--color-fd-popover: hsl(0, 0%, 100%);
147
--color-fd-popover-foreground: hsl(0, 0%, 15.1%);
15-
16-
/* Action Colors */
178
--color-fd-primary: hsl(210, 100%, 44%);
18-
/* Main action color */
199
--color-fd-primary-foreground: hsl(0, 0%, 98%);
2010
--color-fd-secondary: hsl(240, 6%, 97%);
2111
--color-fd-secondary-foreground: hsl(0, 0%, 9%);
22-
23-
/* Utility Colors */
2412
--color-fd-border: hsl(0, 0%, 89.8%);
2513
--color-fd-ring: hsl(0, 0%, 63.9%);
2614
--color-fd-muted: hsl(0, 0%, 96%);
2715
--color-fd-muted-foreground: hsl(240, 6%, 50%);
2816
--color-fd-accent: hsl(0, 0%, 94.1%);
2917
--color-fd-accent-foreground: hsl(240, 6%, 25%);
30-
}
3118

32-
/* =============================================================================
33-
Dark Theme Variables
34-
========================================================================== */
19+
--color-fd-prose-body:
20+
color-mix(in oklab, var(--color-fd-foreground) 80%, transparent);
21+
}
3522

3623
.dark {
37-
/* Primary UI Colors */
3824
--color-fd-background: hsl(0, 0%, 7.04%);
3925
--color-fd-foreground: hsl(0, 0%, 92%);
40-
41-
/* Component Colors */
4226
--color-fd-card: hsl(0, 0%, 9.8%);
4327
--color-fd-card-foreground: hsl(0, 0%, 98%);
4428
--color-fd-popover: hsl(0, 0%, 9.8%);
4529
--color-fd-popover-foreground: hsl(0, 0%, 88%);
46-
47-
/* Action Colors */
4830
--color-fd-primary: hsl(0, 0%, 98%);
49-
/* Inverted in dark mode */
5031
--color-fd-primary-foreground: hsl(0, 0%, 9%);
5132
--color-fd-secondary: hsl(0, 0%, 12.9%);
5233
--color-fd-secondary-foreground: hsl(0, 0%, 98%);
53-
54-
/* Utility Colors */
5534
--color-fd-border: hsl(0, 0%, 14%);
5635
--color-fd-ring: hsl(0, 0%, 54.9%);
5736
--color-fd-muted: hsl(0, 0%, 12.9%);
5837
--color-fd-muted-foreground: hsl(0, 0%, 60.9%);
5938
--color-fd-accent: hsl(0, 0%, 16.9%);
6039
--color-fd-accent-foreground: hsl(0, 0%, 90%);
61-
}
6240

63-
/* =============================================================================
64-
Typography System
65-
========================================================================== */
41+
--color-fd-prose-body:
42+
color-mix(in oklab, var(--color-fd-foreground) 80%, transparent);
43+
}
6644

6745
:root {
68-
/* Main text font stack */
6946
--font-family-body:
7047
"SF Pro Text",
7148
"SF Pro Icons",
@@ -85,7 +62,6 @@
8562
"Segoe UI Symbol",
8663
"Noto Color Emoji";
8764

88-
/* UI elements font stack */
8965
--font-family-ui:
9066
system-ui,
9167
-apple-system,
@@ -103,7 +79,6 @@
10379
"Segoe UI Symbol",
10480
"Noto Color Emoji";
10581

106-
/* Monospace font stack for code */
10782
--font-family-mono:
10883
var(--font-ibm_plex_mono),
10984
ui-monospace,
@@ -113,60 +88,39 @@
11388
monospace;
11489
}
11590

116-
/* =============================================================================
117-
Global Element Styling
118-
========================================================================== */
119-
120-
/* Base body styling */
12191
body {
12292
font-family: var(--font-family-body);
12393
}
12494

125-
/* Interactive elements */
12695
button {
12796
cursor: pointer;
12897
}
12998

130-
/* =============================================================================
131-
Focus States
132-
========================================================================== */
133-
134-
/* Remove default focus outline */
13599
:focus-visible {
136100
outline: none;
137101
}
138102

139-
/* Custom focus style for accessibility */
140103
:focus-visible:not([class*="outline-none"]) {
141104
outline: 2px solid var(--color-fd-primary);
142105
outline-offset: -2px;
143106
/* Commented out box-shadow alternative:
144107
box-shadow: inset 0 0 0 3px color-mix(in oklab, var(--color-fd-primary) 20%, transparent); */
145108
}
146109

147-
/* Remove focus outline from tab panels */
148110
[role="tabpanel"]:focus-visible {
149111
outline: none;
150112
}
151113

152-
/* =============================================================================
153-
Sidebar Navigation Styling
154-
========================================================================== */
155-
156114
#nd-docs-layout #nd-sidebar {
157-
158-
/* Active link styling */
159115
a[data-active] {
160116
font-weight: 400;
161117
}
162118

163-
/* Section headings */
164119
p.mt-8.mb-2[style^="padding-inline-start:"] {
165120
margin-top: 28px;
166121
margin-bottom: 16px;
167122
}
168123

169-
/* Navigation items */
170124
div[data-state],
171125
a[data-active] {
172126
margin-top: 4px;
@@ -175,58 +129,45 @@ button {
175129
}
176130
}
177131

178-
/* Sidebar adjustments for dark mode */
179132
.dark #nd-sidebar {
180133
--color-fd-muted: hsl(0, 0%, 16%);
181134
--color-fd-secondary: hsl(0, 0%, 18%);
182135
--color-fd-muted-foreground: hsl(0, 0%, 72%);
183136
}
184137

185-
/* =============================================================================
186-
Content/Prose Styling
187-
========================================================================== */
188-
189138
.prose {
190139
font-family: var(--font-family-body);
191140
--tw-prose-links: var(--color-fd-primary);
192-
/* Link color */
193141

194-
/* Code block styling */
195142
.fd-codeblock.shiki {
196143
background-color: color-mix(in oklab, var(--color-fd-secondary) 25%, transparent);
197144
}
198145

199-
/* Remove outlines from code blocks */
200146
.fd-codeblock,
201147
[data-radix-scroll-area-viewport],
202148
[data-radix-scroll-area-viewport]>div {
203149
outline: none;
204150
}
205151

206-
/* Inline code styling */
207152
:where(code):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
208153
border: none;
209154
padding: .125rem .25em;
210155
font-size: 14px;
211156
}
212157

213-
/* Table styling */
214158
table {
215159
font-size: 1em;
216160

217-
/* Code inside tables */
218161
thead tr th code,
219162
tbody tr td code {
220163
white-space: nowrap;
221164
}
222165
}
223166
}
224167

225-
/* Dark mode adjustments for content */
226168
.dark .prose {
227169
--tw-prose-body: color-mix(in oklab, var(--color-fd-foreground) 80%, transparent);
228170

229-
/* Code text color in dark mode */
230171
:where(code):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
231172
color: #ffffff;
232173
}

apps/website/components/ESLintReact.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function ESLintReact() {
88
<div className="flex flex-col items-center gap-4 m-0 mx-auto p-8 w-fit">
99
<Image alt="logo" height="150" quality={100} src={logo as StaticImageData} width="150" />
1010
<span className="text-2xl">ESLint React</span>
11-
<p className="text-center text-gray-700 dark:text-gray-400 pt-4">
11+
<p className="text-center text-(--color-fd-prose-body) pt-4">
1212
A series of composable ESLint rules for React and friends.
1313
</p>
1414
</div>

0 commit comments

Comments
 (0)