Skip to content

Commit 33de2a1

Browse files
committed
Merge remote-tracking branch 'origin/v3' into chore/test-old-neutral
2 parents 1afc9b3 + 6aab62e commit 33de2a1

File tree

86 files changed

+3394
-3045
lines changed

Some content is hidden

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

86 files changed

+3394
-3045
lines changed

docs/app/components/content/SupportedLanguages.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function getEmojiFlag(locale: string): string {
2525
kk: 'kz', // Kazakh -> Kazakhstan
2626
km: 'kh', // Khmer -> Cambodia
2727
ko: 'kr', // Korean -> South Korea
28+
ky: 'kg', // Kyrgyz -> Kyrgyzstan
2829
ms: 'my', // Malay -> Malaysia
2930
nb: 'no', // Norwegian Bokmål -> Norway
3031
sl: 'si', // Slovenian -> Slovenia

docs/app/components/content/examples/context-menu/ContextMenuCustomSlotExample.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const items = [
2828
</template>
2929

3030
<template #refresh-trailing>
31-
<UIcon v-if="loading" name="i-lucide-refresh-cw" class="shrink-0 size-5 text-primary animate-spin" />
31+
<UIcon v-if="loading" name="i-lucide-loader-circle" class="shrink-0 size-5 text-primary animate-spin" />
3232
</template>
3333
</UContextMenu>
3434
</template>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<script lang="ts" setup>
2+
const open = ref(false)
3+
</script>
4+
5+
<template>
6+
<UPopover
7+
v-model:open="open"
8+
:dismissible="false"
9+
:ui="{ content: 'w-(--reka-popper-anchor-width) p-4' }"
10+
>
11+
<template #anchor>
12+
<UInput placeholder="Focus to open" @focus="open = true" @blur="open = false" />
13+
</template>
14+
15+
<template #content>
16+
<Placeholder class="w-full aspect-square" />
17+
</template>
18+
</UPopover>
19+
</template>

docs/content/1.getting-started/contribution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ pnpm run test:vue # for Vue
225225
```
226226

227227
::tip
228-
If you have to update the snapshots, press `u` when running the tests.
228+
If you have to update the snapshots, press `u` after the tests have finished running.
229229
::
230230

231231
### Commit Conventions

docs/content/3.components/button.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,13 @@ This also works with the [Form](/components/form) component.
258258

259259
### Loading Icon
260260

261-
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-refresh-cw`.
261+
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-loader-circle`.
262262

263263
::component-code
264264
---
265265
props:
266266
loading: true
267-
loadingIcon: 'i-lucide-repeat-2'
267+
loadingIcon: 'i-lucide-loader'
268268
slots:
269269
default: Button
270270
---

docs/content/3.components/command-palette.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ props:
279279

280280
### Loading Icon
281281

282-
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-refresh-cw`.
282+
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-loader-circle`.
283283

284284
::component-code
285285
---
@@ -295,7 +295,7 @@ class: '!p-0'
295295
props:
296296
autofocus: false
297297
loading: true
298-
loadingIcon: 'i-lucide-repeat-2'
298+
loadingIcon: 'i-lucide-loader'
299299
groups:
300300
- id: 'apps'
301301
items:

docs/content/3.components/input-menu.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ props:
518518

519519
### Loading Icon
520520

521-
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-refresh-cw`.
521+
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-loader-circle`.
522522

523523
::component-code
524524
---
@@ -532,7 +532,7 @@ external:
532532
props:
533533
modelValue: 'Backlog'
534534
loading: true
535-
loadingIcon: 'i-lucide-repeat-2'
535+
loadingIcon: 'i-lucide-loader'
536536
items:
537537
- Backlog
538538
- Todo
@@ -612,7 +612,7 @@ props:
612612
---
613613
::
614614

615-
### With icons in items
615+
### With icon in items
616616

617617
You can use the `icon` property to display an [Icon](/components/icon) inside the items.
618618

docs/content/3.components/input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ props:
172172

173173
### Loading Icon
174174

175-
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-refresh-cw`.
175+
Use the `loading-icon` prop to customize the loading icon. Defaults to `i-lucide-loader-circle`.
176176

177177
::component-code
178178
---
179179
ignore:
180180
- placeholder
181181
props:
182182
loading: true
183-
loadingIcon: 'i-lucide-repeat-2'
183+
loadingIcon: 'i-lucide-loader'
184184
placeholder: 'Search...'
185185
---
186186
::

0 commit comments

Comments
 (0)