Skip to content

Commit 7ceedc5

Browse files
committed
Merge branch 'main' into pr-fix-mdx-examples
2 parents b897744 + 2048395 commit 7ceedc5

File tree

99 files changed

+5355
-3610
lines changed

Some content is hidden

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

99 files changed

+5355
-3610
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
12-
"enforceBuildableLibDependency": true,
12+
"enforceBuildableLibDependency": false,
1313
"allow": [],
1414
"depConstraints": [
1515
{

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
save-exact = true
22
auto-install-peers=true
3+
dedupe-peer-dependents=true
34
public-hoist-pattern[]=@types*

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
**/*.log
33
**/.DS_Store
44
*.
5+
.vscode
56
dist
67
node_modules
78
coverage

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"conventionalCommits.scopes": ["fluffy", "headless", "docs"],
44
"tailwindCSS.experimental.classRegex": [
55
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
6-
]
6+
],
7+
"editor.codeActionsOnSave": {
8+
"source.removeUnusedImports": true
9+
}
710
}
42.9 KB
Binary file not shown.

apps/website/public/images/morphing-diamonds.svg

Loading
23.8 KB
Binary file not shown.

apps/website/src/_state/component-statuses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const statusByComponent: ComponentKitsStatuses = {
4141
headless: {
4242
Accordion: ComponentStatus.Beta,
4343
Carousel: ComponentStatus.Planned,
44-
Combobox: ComponentStatus.Draft,
44+
Combobox: ComponentStatus.Beta,
4545
Popover: ComponentStatus.Draft,
4646
Select: ComponentStatus.Draft,
4747
Separator: ComponentStatus.Beta,

apps/website/src/global.css

Lines changed: 167 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import '@fontsource-variable/inter';
2-
31
@tailwind components;
42
@tailwind base;
53
@tailwind utilities;
@@ -40,7 +38,8 @@
4038
}
4139

4240
.dark {
43-
--color-background: 263 84% 5%;
41+
/* previous 263 84% 5% */
42+
--color-background: 222 47% 11%;
4443
--color-foreground: 263 40% 98%;
4544

4645
--color-primary: 263 40% 98%;
@@ -91,49 +90,91 @@
9190
--light-color-bg: rgb(203 213 225);
9291
--light-color-text: #333;
9392

94-
--shadow-color: 0deg 0% 63%;
95-
--shadow-elevation-low: 0.5px 0.6px 0.9px hsl(var(--shadow-color) / 0.34),
96-
0.9px 1px 1.5px -1.2px hsl(var(--shadow-color) / 0.34),
97-
2.1px 2.3px 3.5px -2.5px hsl(var(--shadow-color) / 0.34);
98-
--shadow-elevation-medium: 0.5px 0.6px 0.9px hsl(var(--shadow-color) / 0.36),
99-
1.7px 1.9px 2.9px -0.8px hsl(var(--shadow-color) / 0.36),
100-
4.3px 4.8px 7.2px -1.7px hsl(var(--shadow-color) / 0.36),
101-
10.4px 11.6px 17.5px -2.5px hsl(var(--shadow-color) / 0.36);
102-
--shadow-elevation-high: 0.5px 0.6px 0.9px hsl(var(--shadow-color) / 0.34),
103-
3px 3.4px 5.1px -0.4px hsl(var(--shadow-color) / 0.34),
104-
5.6px 6.3px 9.5px -0.7px hsl(var(--shadow-color) / 0.34),
105-
9.3px 10.4px 15.7px -1.1px hsl(var(--shadow-color) / 0.34),
106-
14.8px 16.6px 25px -1.4px hsl(var(--shadow-color) / 0.34),
107-
23.1px 26px 39.1px -1.8px hsl(var(--shadow-color) / 0.34),
108-
35.1px 39.5px 59.4px -2.1px hsl(var(--shadow-color) / 0.34),
109-
51.8px 58.2px 87.7px -2.5px hsl(var(--shadow-color) / 0.34);
110-
93+
/* primary colors */
94+
--qwikui-purple-50: #f9f5ff;
95+
--qwikui-purple-100: #f2e8ff;
96+
--qwikui-purple-200: #e7d6fe;
97+
--qwikui-purple-300: #d4b5fd;
98+
--qwikui-purple-400: #b37bfa;
99+
--qwikui-purple-500: #9f57f5;
100+
--qwikui-purple-600: #8835e8;
101+
--qwikui-purple-700: #7424cc;
102+
--qwikui-purple-800: #6323a6;
103+
--qwikui-purple-900: #521d86;
104+
--qwikui-purple-950: #360863;
105+
106+
--qwikui-blue-50: #effaff;
107+
--qwikui-blue-100: #def3ff;
108+
--qwikui-blue-200: #b6eaff;
109+
--qwikui-blue-300: #76dbff;
110+
--qwikui-blue-400: #2dcaff;
111+
--qwikui-blue-500: #02b9fc;
112+
--qwikui-blue-600: #0090d2;
113+
--qwikui-blue-700: #0073aa;
114+
--qwikui-blue-800: #00618c;
115+
--qwikui-blue-900: #075073;
116+
--qwikui-blue-950: #04334d;
117+
118+
/* neutrals */
119+
--qwikui-slate-50: #f8fafc;
120+
--qwikui-slate-100: #f1f5f9;
121+
--qwikui-slate-200: #e2e8f0;
122+
--qwikui-slate-300: #cbd5e1;
123+
--qwikui-slate-400: #94a3b8;
124+
--qwikui-slate-500: #64748b;
125+
--qwikui-slate-600: #475569;
126+
--qwikui-slate-700: #334155;
127+
--qwikui-slate-800: #1e293b;
128+
--qwikui-slate-900: #0f172a;
129+
--qwikui-slate-950: #020617;
130+
131+
/* light themed shadows */
132+
--light-shadow-color: 0deg 0% 63%;
133+
--light-shadow-elevation-low: 0.3px 0.5px 0.7px hsl(var(--light-shadow-color) / 0.34),
134+
0.4px 0.8px 1px -1.2px hsl(var(--light-shadow-color) / 0.34),
135+
1px 2px 2.5px -2.5px hsl(var(--light-shadow-color) / 0.34);
136+
--light-shadow-elevation-medium: 0.3px 0.5px 0.7px hsl(var(--light-shadow-color) / 0.36),
137+
0.8px 1.6px 2px -0.8px hsl(var(--light-shadow-color) / 0.36),
138+
2.1px 4.1px 5.2px -1.7px hsl(var(--light-shadow-color) / 0.36),
139+
5px 10px 12.6px -2.5px hsl(var(--light-shadow-color) / 0.36);
140+
--light-shadow-elevation-high: 0.3px 0.5px 0.7px hsl(var(--light-shadow-color) / 0.3),
141+
1.3px 2.6px 3.3px -0.3px hsl(var(--light-shadow-color) / 0.3),
142+
2.4px 4.8px 6px -0.6px hsl(var(--light-shadow-color) / 0.3),
143+
3.7px 7.5px 9.4px -0.9px hsl(var(--light-shadow-color) / 0.3),
144+
5.7px 11.3px 14.2px -1.2px hsl(var(--light-shadow-color) / 0.3),
145+
8.5px 16.9px 21.3px -1.6px hsl(var(--light-shadow-color) / 0.3),
146+
12.4px 24.9px 31.3px -1.9px hsl(var(--light-shadow-color) / 0.3),
147+
17.8px 35.7px 44.9px -2.2px hsl(var(--light-shadow-color) / 0.3),
148+
25px 50px 62.9px -2.5px hsl(var(--light-shadow-color) / 0.3);
149+
150+
/* dark themed shadows */
111151
--dark-shadow-color: 218deg 49% 7%;
112-
--dark-shadow-elevation-low: 0.5px 0.6px 0.9px hsl(var(--shadow-color) / 0.34),
113-
0.9px 1.1px 1.6px -1.2px hsl(var(--dark-shadow-color) / 0.34),
114-
2.2px 2.6px 3.8px -2.5px hsl(var(--dark-shadow-color) / 0.34);
115-
--dark-shadow-elevation-medium: 0.5px 0.6px 0.9px hsl(var(--dark-shadow-color) / 0.36),
116-
1.8px 2.1px 3.1px -0.8px hsl(var(--dark-shadow-color) / 0.36),
117-
4.4px 5.3px 7.7px -1.7px hsl(var(--dark-shadow-color) / 0.36),
118-
10.8px 12.8px 18.8px -2.5px hsl(var(--dark-shadow-color) / 0.36);
119-
--dark-shadow-elevation-high: 0.5px 0.6px 0.9px hsl(var(--dark-shadow-color) / 0.34),
120-
3.1px 3.7px 5.4px -0.4px hsl(var(--dark-shadow-color) / 0.34),
121-
5.9px 7px 10.3px -0.7px hsl(var(--dark-shadow-color) / 0.34),
122-
9.6px 11.5px 16.9px -1.1px hsl(var(--dark-shadow-color) / 0.34),
123-
15.4px 18.3px 26.9px -1.4px hsl(var(--dark-shadow-color) / 0.34),
124-
24.1px 28.6px 42.1px -1.8px hsl(var(--dark-shadow-color) / 0.34),
125-
36.6px 43.5px 64px -2.1px hsl(var(--dark-shadow-color) / 0.34),
126-
53.9px 64.1px 94.2px -2.5px hsl(var(--dark-shadow-color) / 0.34);
152+
--dark-shadow-elevation-low: 0.4px 0.6px 0.8px hsl(var(--dark-shadow-color) / 0.34),
153+
0.7px 1px 1.4px -1.2px hsl(var(--dark-shadow-color) / 0.34),
154+
1.7px 2.5px 3.4px -2.5px hsl(var(--dark-shadow-color) / 0.34);
155+
--dark-shadow-elevation-medium: 0.4px 0.6px 0.8px hsl(var(--dark-shadow-color) / 0.36),
156+
1.4px 2px 2.7px -0.8px hsl(var(--dark-shadow-color) / 0.36),
157+
3.5px 5.1px 7px -1.7px hsl(var(--dark-shadow-color) / 0.36),
158+
8.6px 12.3px 16.9px -2.5px hsl(var(--dark-shadow-color) / 0.36);
159+
--dark-shadow-elevation-high: 0.4px 0.6px 0.8px hsl(var(--dark-shadow-color) / 0.3),
160+
2.3px 3.2px 4.4px -0.3px hsl(var(--dark-shadow-color) / 0.3),
161+
4.1px 5.8px 8px -0.6px hsl(var(--dark-shadow-color) / 0.3),
162+
6.4px 9.2px 12.6px -0.9px hsl(var(--dark-shadow-color) / 0.3),
163+
9.8px 13.9px 19.1px -1.2px hsl(var(--dark-shadow-color) / 0.3),
164+
14.6px 20.8px 28.6px -1.6px hsl(var(--dark-shadow-color) / 0.3),
165+
21.4px 30.6px 42px -1.9px hsl(var(--dark-shadow-color) / 0.3),
166+
30.8px 43.9px 60.3px -2.2px hsl(var(--dark-shadow-color) / 0.3),
167+
43.1px 61.5px 84.5px -2.5px hsl(var(--dark-shadow-color) / 0.3);
127168
}
128169

129170
.light {
130171
--color-bg: rgb(255, 255, 255);
131-
--color-text: #333;
172+
--color-text: var(--qwikui-slate-950);
132173
}
133174

134175
.dark {
135-
--color-bg: rgb(30 41 59);
136-
--color-text: rgb(243, 243, 243);
176+
--color-bg: var(--qwikui-slate-800);
177+
--color-text: #fff;
137178
}
138179

139180
html {
@@ -147,6 +188,23 @@ html {
147188

148189
body {
149190
min-height: 100%;
191+
font-family: 'Inter Variable', sans-serif;
192+
}
193+
194+
h1,
195+
h2,
196+
h3,
197+
h4,
198+
h5,
199+
h6 {
200+
overflow-wrap: break-word;
201+
line-height: 1.2;
202+
}
203+
204+
p,
205+
ul,
206+
ol {
207+
line-height: 1.75;
150208
}
151209

152210
.layout {
@@ -165,4 +223,75 @@ body {
165223
.accordion-animation-1[data-state='closed'] {
166224
animation: 500ms cubic-bezier(0.87, 0, 0.13, 1) 0s 1 normal forwards accordion-close;
167225
}
226+
227+
.text-outline-lg {
228+
text-shadow: 1.6px 0.6px 0 var(--qwikui-blue-800),
229+
-0.6px -0.6px 0 var(--qwikui-blue-800), 0.6px -0.6px 0 var(--qwikui-blue-800),
230+
-0.6px 0.6px 0 var(--qwikui-blue-800), 0.6px 0.6px 0 var(--qwikui-blue-800);
231+
}
232+
233+
.dark .text-outline-lg {
234+
text-shadow: 1.2px 1.2px 0 var(--qwikui-purple-900),
235+
-0.6px -0.6px 0 var(--qwikui-purple-900), 0.6px -0.6px 0 var(--qwikui-purple-900),
236+
-0.6px 0.6px 0 var(--qwikui-purple-900), 0.6px 0.6px 0 var(--qwikui-purple-900);
237+
}
238+
239+
.text-outline-beta {
240+
text-shadow: 1.5px 0.5px 0 var(--qwikui-blue-800),
241+
-0.5px -0.5px 0 var(--qwikui-blue-800), 0.5px -0.5px 0 var(--qwikui-blue-800),
242+
-0.5px 0.5px 0 var(--qwikui-blue-800), 0.5px 0.5px 0 var(--qwikui-blue-800);
243+
}
244+
245+
.dark .text-outline-beta {
246+
text-shadow: 1.5px 0.5px 0 var(--qwikui-purple-800),
247+
-0.5px -0.5px 0 var(--qwikui-purple-800), 0.5px -0.5px 0 var(--qwikui-purple-800),
248+
-0.5px 0.5px 0 var(--qwikui-purple-800), 0.5px 0.5px 0 var(--qwikui-purple-800);
249+
}
250+
251+
.text-outline-draft {
252+
text-shadow: 1.5px 0.5px 0 var(--qwikui-slate-900),
253+
-0.5px -0.5px 0 var(--qwikui-slate-900), 0.5px -0.5px 0 var(--qwikui-slate-900),
254+
-0.5px 0.5px 0 var(--qwikui-slate-900), 0.5px 0.5px 0 var(--qwikui-slate-900);
255+
}
256+
.dark .text-outline-draft {
257+
text-shadow: 1.5px 0.5px 0 var(--qwikui-slate-950),
258+
-0.5px -0.5px 0 var(--qwikui-slate-950), 0.5px -0.5px 0 var(--qwikui-slate-950),
259+
-0.5px 0.5px 0 var(--qwikui-slate-950), 0.5px 0.5px 0 var(--qwikui-slate-950);
260+
}
261+
262+
.text-outline-planned {
263+
text-shadow: 1.5px 0.5px 0 var(--qwikui-slate-500),
264+
-0.5px -0.5px 0 var(--qwikui-slate-500), 0.5px -0.5px 0 var(--qwikui-slate-500),
265+
-0.5px 0.5px 0 var(--qwikui-slate-500), 0.5px 0.5px 0 var(--qwikui-slate-500);
266+
}
267+
268+
.dark .text-outline-planned {
269+
text-shadow: 1.5px 0.5px 0 var(--qwikui-slate-500),
270+
-0.4px -0.4px 0 var(--qwikui-slate-500), 0.4px -0.4px 0 var(--qwikui-slate-500),
271+
-0.4px 0.4px 0 var(--qwikui-slate-500), 0.4px 0.4px 0 var(--qwikui-slate-500);
272+
}
273+
274+
.text-outline-blue-title {
275+
text-shadow: 1.2px 1.2px 0 var(--qwikui-blue-800),
276+
-0.6px -0.6px 0 var(--qwikui-blue-800), 0.6px -0.6px 0 var(--qwikui-blue-800),
277+
-0.6px 0.6px 0 var(--qwikui-blue-800), 0.6px 0.6px 0 var(--qwikui-blue-800);
278+
}
279+
280+
.text-outline-purple-title {
281+
text-shadow: 1.2px 1.2px 0 var(--qwikui-purple-900),
282+
-0.6px -0.6px 0 var(--qwikui-purple-900), 0.6px -0.6px 0 var(--qwikui-purple-900),
283+
-0.6px 0.6px 0 var(--qwikui-purple-900), 0.6px 0.6px 0 var(--qwikui-purple-900);
284+
}
285+
286+
.dark .text-outline-blue-title {
287+
text-shadow: 1.2px 1.2px 0 var(--qwikui-blue-700),
288+
-0.8px -0.8px 0 var(--qwikui-blue-700), 0.8px -0.8px 0 var(--qwikui-blue-700),
289+
-0.8px 0.8px 0 var(--qwikui-blue-700), 0.8px 0.8px 0 var(--qwikui-blue-700);
290+
}
291+
292+
.dark .text-outline-purple-title {
293+
text-shadow: 1.2px 1.2px 0 var(--qwikui-purple-700),
294+
-0.8px -0.8px 0 var(--qwikui-purple-700), 0.8px -0.8px 0 var(--qwikui-purple-700),
295+
-0.8px 0.8px 0 var(--qwikui-purple-700), 0.8px 0.8px 0 var(--qwikui-purple-700);
296+
}
168297
}

apps/website/src/routes/_components/footer/footer.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ import { DiscordIcon } from '../icons/discord';
44

55
export const Footer = component$(() => {
66
return (
7-
<footer class="bg-gray-300 dark:bg-gray-900">
8-
<div class="max-w-7xl mx-auto py-12 px-4 overflow-hidden sm:px-6 lg:px-8">
7+
<footer class="border-t-[1px] border-slate-100 border-slate-300 bg-slate-50 dark:border-slate-800 dark:bg-slate-950">
8+
<div class="mx-auto max-w-7xl overflow-hidden px-4 py-12 sm:px-6 lg:px-8">
99
<nav class="-mx-5 -my-2 flex flex-wrap justify-center" aria-label="Footer">
1010
<div class="px-5 py-2">
1111
<a
1212
href="/about"
13-
class="text-base text-gray-500 hover:text-gray-900 dark:hover:text-gray-300"
13+
class="text-base text-slate-800 hover:text-slate-900 dark:text-white dark:hover:text-slate-300"
1414
>
1515
About
1616
</a>
1717
</div>
1818
<div class="px-5 py-2">
1919
<a
2020
href="/docs/headless/introduction"
21-
class="text-base text-gray-500 hover:text-gray-900 dark:hover:text-gray-300"
21+
class="text-base text-slate-800 hover:text-slate-900 dark:text-white dark:hover:text-slate-300"
2222
>
2323
Headless Kit
2424
</a>
@@ -28,7 +28,7 @@ export const Footer = component$(() => {
2828
<a
2929
href="https://discord.gg/PVWUUejrez"
3030
target="_blank"
31-
class="text-base text-gray-500 hover:text-gray-900 dark:hover:text-gray-300"
31+
class="text-base text-slate-800 hover:text-slate-900 dark:text-white dark:hover:text-slate-300"
3232
>
3333
Community
3434
</a>
@@ -38,7 +38,7 @@ export const Footer = component$(() => {
3838
<a
3939
href="https://www.w3.org/standards/webdesign/accessibility"
4040
target="_blank"
41-
class="text-base text-gray-500 hover:text-gray-900 dark:hover:text-gray-300"
41+
class="text-base text-slate-800 hover:text-slate-900 dark:text-white dark:hover:text-slate-300"
4242
>
4343
Accessibility
4444
</a>
@@ -47,7 +47,7 @@ export const Footer = component$(() => {
4747
<a
4848
href="https://qwik.builder.io/docs"
4949
target="_blank"
50-
class="text-base text-gray-500 hover:text-gray-900 dark:hover:text-gray-300"
50+
class="text-base text-slate-800 hover:text-slate-900 dark:text-white dark:hover:text-slate-300"
5151
>
5252
Qwik Documentation
5353
</a>
@@ -58,20 +58,20 @@ export const Footer = component$(() => {
5858
target="_blank"
5959
href="https://github.com/qwikifiers/qwik-ui"
6060
aria-label="Qwik-UI GitHub repository"
61-
class="text-gray-400 hover:text-gray-500"
61+
class="text-slate-600 hover:text-slate-800 dark:text-slate-400 dark:hover:text-white"
6262
>
6363
<GitHubIcon />
6464
</a>
6565
<a
6666
target="_blank"
6767
href="https://discord.gg/PVWUUejrez"
6868
aria-label="Qwik-UI Discord server"
69-
class="text-gray-400 hover:text-gray-500"
69+
class="text-slate-600 hover:text-slate-800 dark:text-slate-400 dark:hover:text-white"
7070
>
7171
<DiscordIcon />
7272
</a>
7373
</div>
74-
<p class="mt-8 text-center text-base dark:text-gray-400 text-gray-600">
74+
<p class="mt-8 text-center text-base text-slate-600 dark:text-slate-400">
7575
&copy; 2023 Qwik UI. All rights reserved.
7676
</p>
7777
</div>

0 commit comments

Comments
 (0)