Skip to content

Commit a565c90

Browse files
authored
Merge branch 'main' into bugfix/392-default-darktheme-setting
2 parents 9ba7d9f + 03e1778 commit a565c90

File tree

13 files changed

+2587
-2571
lines changed

13 files changed

+2587
-2571
lines changed

.all-contributorsrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,18 @@
314314
"test",
315315
"doc"
316316
]
317+
},
318+
{
319+
"login": "Zankel-Engineering",
320+
"name": "Zankel-Engineering",
321+
"avatar_url": "https://avatars.githubusercontent.com/u/43412711?v=4",
322+
"profile": "http://zankel-engineering.de",
323+
"contributions": [
324+
"code",
325+
"test",
326+
"bug",
327+
"a11y"
328+
]
317329
}
318330
],
319331
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
119119
</tr>
120120
<tr>
121121
<td align="center" valign="top" width="14.28%"><a href="https://github.com/wmertens"><img src="https://avatars.githubusercontent.com/u/54934?v=4?s=100" width="100px;" alt="Wout Mertens"/><br /><sub><b>Wout Mertens</b></sub></a><br /><a href="https://github.com/qwikifiers/qwik-ui/commits?author=wmertens" title="Code">💻</a> <a href="#research-wmertens" title="Research">🔬</a> <a href="#ideas-wmertens" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/qwikifiers/qwik-ui/commits?author=wmertens" title="Tests">⚠️</a> <a href="https://github.com/qwikifiers/qwik-ui/commits?author=wmertens" title="Documentation">📖</a></td>
122+
<td align="center" valign="top" width="14.28%"><a href="http://zankel-engineering.de"><img src="https://avatars.githubusercontent.com/u/43412711?v=4?s=100" width="100px;" alt="Zankel-Engineering"/><br /><sub><b>Zankel-Engineering</b></sub></a><br /><a href="https://github.com/qwikifiers/qwik-ui/commits?author=Zankel-Engineering" title="Code">💻</a> <a href="https://github.com/qwikifiers/qwik-ui/commits?author=Zankel-Engineering" title="Tests">⚠️</a> <a href="https://github.com/qwikifiers/qwik-ui/issues?q=author%3AZankel-Engineering" title="Bug reports">🐛</a> <a href="#a11y-Zankel-Engineering" title="Accessibility">️️️️♿️</a></td>
122123
</tr>
123124
</tbody>
124125
</table>

apps/website/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"description": "The Qwik UI Website",
44
"private": true,
55
"dependencies": {
6-
"@qwik-ui/headless": "file:../../dist/packages/kit-headless",
7-
"@qwik-ui/tailwind": "file:../../dist/packages/kit-tailwind",
8-
"@qwik-ui/material": "file:../../dist/packages/kit-material",
9-
"@qwik-ui/primitives": "file:../../dist/packages/primitives"
6+
"@qwik-ui/headless": "workspace:*",
7+
"@qwik-ui/tailwind": "workspace:*",
8+
"@qwik-ui/material": "workspace:*",
9+
"@qwik-ui/primitives": "workspace:*"
1010
}
1111
}

apps/website/src/routes/docs/headless/(components)/popover/examples.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const MainExample = component$(() => {
1010
<PopoverContent>
1111
<div class="p-4 bg-gray-500">Hi, I'm the content</div>
1212
</PopoverContent>
13-
<PopoverTrigger> Click on me </PopoverTrigger>
13+
<PopoverTrigger>Click on me</PopoverTrigger>
1414
</Popover>
1515
</div>
1616
<div q:slot="codeExample">
@@ -28,7 +28,7 @@ export const Example1 = component$(() => {
2828
<PopoverContent>
2929
<div class="p-4 bg-gray-500">Hi, I'm the content, but now on top</div>
3030
</PopoverContent>
31-
<PopoverTrigger> Click on me </PopoverTrigger>
31+
<PopoverTrigger>Click on me</PopoverTrigger>
3232
</Popover>
3333
</div>
3434
<div q:slot="codeExample">

apps/website/src/routes/docs/tailwind/(components)/popover/index.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ export default component$(() => {
2626
<Box />
2727
</PopoverContent>
2828
<PopoverTrigger>
29-
<Button onClick$={() => console.log('here')}>
30-
Offset and position
31-
</Button>
29+
<Button onClick$={() => console.log('here')}>Offset and position</Button>
3230
</PopoverTrigger>
3331
</Popover>
3432

@@ -88,8 +86,8 @@ export default component$(() => {
8886

8987
<h1 class="mt-8">DISABLE CLICK OUTSIDE</h1>
9088
<p>
91-
Popovers are not closed when click outside but they can be closed
92-
clicking their own trigger button only
89+
Popovers are not closed when click outside but they can be closed clicking their
90+
own trigger button only
9391
</p>
9492

9593
<div class="flex flex-col gap-2">
@@ -140,8 +138,8 @@ export default component$(() => {
140138
<code>Current state: {JSON.stringify(controlledPopover.value)}</code>
141139
</div>
142140
<p>
143-
The popover can be closed clicking outside or clicking the CLOSE button
144-
inside the popover
141+
The popover can be closed clicking outside or clicking the CLOSE button inside the
142+
popover
145143
</p>
146144
<p>the onUpdate$ callback allows you to sync local and popover states</p>
147145

@@ -156,16 +154,12 @@ export default component$(() => {
156154
<Card>
157155
<CardBody>
158156
<CardTitle>title</CardTitle>
159-
<Button onClick$={() => (controlledPopover.value = false)}>
160-
CLOSE ME
161-
</Button>
157+
<Button onClick$={() => (controlledPopover.value = false)}>CLOSE ME</Button>
162158
</CardBody>
163159
</Card>
164160
</PopoverContent>
165161
<PopoverTrigger>
166-
<Button onClick$={() => console.log('clicked')}>
167-
TOGGLE POPOVER
168-
</Button>
162+
<Button onClick$={() => console.log('clicked')}>TOGGLE POPOVER</Button>
169163
</PopoverTrigger>
170164
</Popover>
171165

cla-signs/v1/cla.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,14 @@
288288
"repoId": 545159943,
289289
"pullRequestNo": 340
290290
},
291+
{
292+
"name": "Zankel-Engineering",
293+
"id": 43412711,
294+
"comment_id": 1802088836,
295+
"created_at": "2023-07-15T17:00:00Z",
296+
"repoId": 666652720,
297+
"pullRequestNo": 363
298+
},
291299
{
292300
"name": "balaji-sivasakthi",
293301
"id": 65065614,
@@ -305,4 +313,4 @@
305313
"pullRequestNo": 385
306314
}
307315
]
308-
}
316+
}

0 commit comments

Comments
 (0)