Skip to content

Commit bef1c38

Browse files
committed
Merge branch 'master' into dev
2 parents aca7d30 + 62a2b56 commit bef1c38

Some content is hidden

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

62 files changed

+439
-195
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ jobs:
114114
exit 1
115115
fi
116116
- uses: vuetifyjs/setup-action@master
117-
- run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
117+
- run: pnpm exec playwright install chromium
118118
- run: pnpm vizzly run "pnpm test:browser"
119119
working-directory: ./packages/vuetify
120120
env:
121121
VIZZLY_TOKEN: ${{ secrets.VIZZLY_TOKEN }}
122+
TEST_TDD_ONLY: 1

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.11.2"
16+
"version": "3.11.3"
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.11.2",
4+
"version": "3.11.3",
55
"private": true,
66
"description": "",
77
"scripts": {

packages/api-generator/src/locale/en/VDatePickerControls.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"props": {
33
"controlHeight": "Sets the height of the controls.",
4+
"controlVariant": "- **docked:** Separate control groups for month and year.\n- **modal:** Month and year are displayed together, clicking the text opens a month picker, clicking the dropdown arrow opens a year picker. There are also arrow buttons to scroll between months.",
45
"modeIcon": "Icon used for the mode button.",
56
"nextIcon": "Icon used for the next button.",
7+
"noMonthPicker": "Only applies to `controlVariant=\"modal\"`, the month and year picker buttons are combined into one that only opens the year picker.",
68
"prevIcon": "Icon used for the previous button.",
79
"viewMode": "Sets the view mode of the date picker."
810
},

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 <john@vuetifyjs.com>",
7-
"version": "3.11.2",
7+
"version": "3.11.3",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",

packages/docs/src/data/new-in.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@
382382
"eager": "3.2.0",
383383
"interactive": "3.8.0",
384384
"stickToTarget": "3.10.0",
385-
"viewportMargin": "3.11.0"
385+
"viewportMargin": "3.11.0",
386+
"persistent": "3.11.3"
386387
}
387388
},
388389
"VVirtualScroll": {

packages/docs/src/examples/v-dialog/misc-data-table.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
</template>
6464

6565
<script setup>
66+
import { computed, ref } from 'vue'
67+
6668
// v-dialog
6769
const dialog = ref(false)
6870
const activator = ref(null)

packages/docs/src/pages/en/about/code-of-conduct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
meta:
33
title: Code of conduct
4-
description: Vuetify provides a safe, inclusive, and judgement free community for developers from all walks of life!
4+
description: Vuetify provides a safe, inclusive, and judgment free community for developers from all walks of life!
55
keywords: vuetify code of conduct, vuetify coc, community conduct
66
---
77

packages/docs/src/pages/en/components/data-iterators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ meta:
66
keywords: data iterators, vuetify data iterator component, vue data iterator component
77
related:
88
- /components/data-tables/basics/
9-
- /components/simple-tables/
9+
- /components/tables/
1010
- /components/toolbars/
1111
features:
1212
github: /components/VDataIterator/

packages/docs/src/pages/en/components/number-inputs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
emphasized: true
33
meta:
44
title: Number inputs
5-
description: The Number input component is used for ...
5+
description: The number input component provides a clean interface for entering numeric values with increment and decrement controls.
66
keywords: Number, vuetify number input component, vue number component
77
related:
88
- /components/inputs/

0 commit comments

Comments
 (0)