Skip to content

Commit bc31d9a

Browse files
KaelWDKaelWD
committed
Merge branch 'master' into dev
2 parents 20c580a + 1b021d3 commit bc31d9a

35 files changed

+215
-198
lines changed

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.10.4"
16+
"version": "3.10.5"
1717
}

‎packages/api-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vuetify/api-generator",
33
"type": "module",
4-
"version": "3.10.4",
4+
"version": "3.10.5",
55
"private": true,
66
"description": "",
77
"scripts": {

‎packages/docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "A Vue.js project",
55
"private": true,
66
"author": "John Leider <[email protected]>",
7-
"version": "3.10.4",
7+
"version": "3.10.5",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",

‎packages/docs/src/examples/transitions/misc-expand-x-padding.vue‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<template>
2-
<v-app>
3-
<v-container>
4-
<v-btn class="ma-2" color="primary" @click="expand = !expand">
5-
Expand Transition
6-
</v-btn>
2+
<v-container>
3+
<v-btn class="ma-2" color="primary" @click="expand = !expand">
4+
Expand Transition
5+
</v-btn>
76

8-
<v-expand-x-transition>
9-
<v-responsive v-show="expand" width="fit-content">
10-
<v-alert
11-
class="text-no-wrap"
12-
text="Smooth transition here"
13-
type="info"
14-
></v-alert>
15-
</v-responsive>
16-
</v-expand-x-transition>
17-
</v-container>
18-
</v-app>
7+
<v-expand-x-transition>
8+
<v-responsive v-show="expand" width="fit-content">
9+
<v-alert
10+
class="text-no-wrap"
11+
text="Smooth transition here"
12+
type="info"
13+
></v-alert>
14+
</v-responsive>
15+
</v-expand-x-transition>
16+
</v-container>
1917
</template>
2018

2119
<script setup>

‎packages/docs/src/examples/v-autocomplete/slot-item-and-vbind-props.vue‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<template>
2-
<v-app>
3-
<v-container>
4-
<v-autocomplete :items="items">
5-
<template v-slot:item="{ props }">
6-
<v-list-item v-bind="props"></v-list-item>
7-
</template>
8-
</v-autocomplete>
9-
</v-container>
10-
</v-app>
2+
<v-container>
3+
<v-autocomplete :items="items">
4+
<template v-slot:item="{ props }">
5+
<v-list-item v-bind="props"></v-list-item>
6+
</template>
7+
</v-autocomplete>
8+
</v-container>
119
</template>
1210

1311
<script setup>

‎packages/docs/src/examples/v-data-table/prop-grouping.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
const groupBy = ref([{ key: 'category', order: 'asc' }, { key: 'status', order: 'asc' }])
1616
1717
const headers = [
18+
{ key: 'data-table-group', title: 'Category' },
1819
{
1920
title: 'Dessert (100g serving)',
2021
align: 'start',
2122
key: 'name',
2223
groupable: false,
2324
},
24-
{ title: 'Category', key: 'category', align: 'end' },
2525
{ title: 'Dairy', key: 'dairy', align: 'end' },
2626
]
2727
const desserts = [

‎packages/docs/src/examples/v-data-table/virtual-custom.vue‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
<template>
2-
<v-app>
3-
<v-container>
4-
<v-chip-group v-model="selectedSize" class="mb-4" mandatory row>
5-
<v-chip
6-
v-for="size in sizes"
7-
:key="size"
8-
:value="size"
9-
color="primary"
10-
variant="outlined"
11-
>
12-
{{ size }} items
13-
</v-chip>
14-
</v-chip-group>
15-
16-
<v-data-table-virtual
17-
:headers="headers"
18-
:items="items"
19-
height="400"
20-
item-key="id"
21-
fixed-header
2+
<v-container>
3+
<v-chip-group v-model="selectedSize" class="mb-4" mandatory row>
4+
<v-chip
5+
v-for="size in sizes"
6+
:key="size"
7+
:value="size"
8+
color="primary"
9+
variant="outlined"
2210
>
23-
<template v-slot:item="{ columns, internalItem, props, itemRef }">
24-
<tr v-bind="props" :ref="itemRef">
25-
<td v-for="column in columns" :key="column.key">
26-
{{ internalItem.raw[column.key] }}
27-
</td>
28-
</tr>
29-
</template>
30-
</v-data-table-virtual>
31-
</v-container>
32-
</v-app>
11+
{{ size }} items
12+
</v-chip>
13+
</v-chip-group>
14+
15+
<v-data-table-virtual
16+
:headers="headers"
17+
:items="items"
18+
height="400"
19+
item-key="id"
20+
fixed-header
21+
>
22+
<template v-slot:item="{ columns, internalItem, props, itemRef }">
23+
<tr v-bind="props" :ref="itemRef">
24+
<td v-for="column in columns" :key="column.key">
25+
{{ internalItem.raw[column.key] }}
26+
</td>
27+
</tr>
28+
</template>
29+
</v-data-table-virtual>
30+
</v-container>
3331
</template>
3432

3533
<script setup>

‎packages/docs/src/examples/v-select/prop-avoid-duplicate-text.vue‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<template>
2-
<v-app>
3-
<v-container>
4-
<v-select v-model="model" :items="items">
5-
<template v-slot:item="{ props, item }">
6-
<v-list-item v-bind="props" :title="null">
7-
<v-list-item-title>{{ item.title }}</v-list-item-title>
8-
</v-list-item>
9-
</template>
10-
</v-select>
11-
</v-container>
12-
</v-app>
2+
<v-container>
3+
<v-select v-model="model" :items="items">
4+
<template v-slot:item="{ props, item }">
5+
<v-list-item v-bind="props" :title="null">
6+
<v-list-item-title>{{ item.title }}</v-list-item-title>
7+
</v-list-item>
8+
</template>
9+
</v-select>
10+
</v-container>
1311
</template>
1412

1513
<script>

‎packages/docs/src/examples/v-text-field/prop-focused.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<template>
2-
<v-app>
3-
<v-container>
4-
<v-text-field v-model="msg" :focused="true" @update:focused=""></v-text-field>
5-
</v-container>
6-
</v-app>
2+
<v-container>
3+
<v-text-field v-model="msg" :focused="true" @update:focused=""></v-text-field>
4+
</v-container>
75
</template>
86

97
<script setup>

‎packages/docs/src/examples/v-video/misc-in-card.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
color="orange"
1313
controls-transition="slide-y-transition"
1414
elevation="0"
15-
image="https://jsek.work/cdn/vt-video-poster.jpg"
15+
image="https://cdn.jsek.work/cdn/vt-video-poster.jpg"
1616
rounded="xl"
17-
src="https://jsek.work/cdn/vt-video.mp4"
17+
src="https://cdn.jsek.work/cdn/vt-video.mp4"
1818
width="100%"
1919
detached
2020
eager

0 commit comments

Comments
 (0)