Skip to content

Commit 3450006

Browse files
committed
Merge branch 'master' into dev
2 parents aca7d30 + 9d37ba9 commit 3450006

File tree

76 files changed

+548
-256
lines changed

Some content is hidden

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

76 files changed

+548
-256
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: 2 additions & 2 deletions
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",
@@ -26,7 +26,7 @@
2626
"@vue/compiler-dom": "^3.5.25",
2727
"@vuelidate/core": "^2.0.3",
2828
"@vuelidate/validators": "^2.0.4",
29-
"@vuetify/one": "^2.6.2",
29+
"@vuetify/one": "^2.6.7",
3030
"algoliasearch": "^4.24.0",
3131
"fflate": "^0.8.2",
3232
"isomorphic-fetch": "^3.0.0",

packages/docs/src/components/app/bar/EcosystemMenu.vue

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,39 @@
2222
appendIcon: '$vuetify-outline',
2323
},
2424
{
25-
title: 'awesome',
26-
href: 'https://github.com/vuetifyjs/awesome-vuetify',
27-
appendIcon: 'mdi-creation-outline',
25+
title: 'vuetify-create',
26+
href: 'https://github.com/vuetifyjs/create/',
27+
appendIcon: '$vuetify-create',
2828
},
2929
{
30-
title: 'brand-kit',
31-
to: rpath('/resources/brand-kit/'),
32-
appendIcon: 'mdi-image-outline',
33-
},
34-
{
35-
title: 'create',
36-
href: 'https://tryvuetify.com/',
37-
appendIcon: 'mdi-widgets-outline',
38-
},
39-
{
40-
title: 'pastebin',
30+
title: 'vuetify-bin',
4131
href: 'https://bin.vuetifyjs.com/',
42-
appendIcon: 'mdi-delete-outline',
32+
appendIcon: '$vuetify-bin',
4333
},
4434
{
45-
title: 'playground',
35+
title: 'vuetify-play',
4636
href: 'https://play.vuetifyjs.com/',
47-
appendIcon: 'mdi-play-circle-outline',
37+
appendIcon: '$vuetify-play',
4838
},
4939
{
50-
title: 'jobs',
51-
to: rpath('/resources/jobs-for-vue/'),
52-
appendIcon: 'mdi-briefcase-variant-outline',
40+
title: 'vuetify-link',
41+
href: 'https://link.vuetifyjs.com/',
42+
appendIcon: '$vuetify-link',
5343
},
5444
{
55-
title: 'snips',
45+
title: 'vuetify-snips',
5646
href: 'https://snips.vuetifyjs.com/',
57-
appendIcon: [
58-
[
59-
'M18.3252 15.9618C17.4833 16.375 16.9265 17.0615 16.6685 17.8346L15.0662 15.7153C14.7199 15.2554 14.815 14.609 15.2835 14.2691L15.4328 14.1624L5.47931 1C3.8566 2.18628 3.51712 4.43889 4.71888 6.03171L12.4929 16.3084C12.9614 15.9685 13.62 16.0618 13.9663 16.5217L17.0759 20.6403C18.1147 22.0132 20.0905 22.4398 21.5435 21.4867C23.2884 20.3471 23.5328 17.8812 21.9101 16.4417C20.9392 15.582 19.493 15.3954 18.3252 15.9618ZM20.9392 20.4004C20.0565 21.0469 18.8073 20.8669 18.1487 20.0005C17.4901 19.1342 17.6802 17.9079 18.5628 17.2614C19.4455 16.615 20.6948 16.7949 21.3534 17.6613C22.0119 18.5277 21.8218 19.754 20.9392 20.4004Z', 1,
60-
],
61-
['M3.08175 16.4865C1.45983 17.9295 1.71879 20.3898 3.47701 21.5202C4.9013 22.4311 6.95255 21.9923 7.96114 20.6491L11.0619 16.5264C11.4094 16.0676 12.0705 15.9679 12.5407 16.307L20.2891 6.01368C21.4885 4.41781 21.1341 2.1703 19.4986 1L9.57624 14.1725L9.72616 14.2789C10.1964 14.6181 10.2986 15.263 9.95105 15.7152L8.34958 17.843C8.0838 17.0717 7.52499 16.3935 6.67996 15.9878C5.501 15.4226 4.04945 15.6221 3.08175 16.4865ZM3.64738 17.6967C4.3016 16.8257 5.55552 16.6395 6.44825 17.2778C7.34099 17.9162 7.5318 19.1397 6.87759 20.0107C6.22337 20.8818 4.96944 21.068 4.07671 20.4297C3.18397 19.7913 2.99316 18.5678 3.64738 17.6967Z', 1],
62-
],
47+
appendIcon: '$vuetify-snips',
6348
},
6449
{
65-
title: 'themes',
66-
to: rpath('/resources/themes/'),
67-
appendIcon: 'mdi-shape-outline',
50+
title: 'vuetify-store',
51+
href: 'https://store.vuetifyjs.com/',
52+
appendIcon: '$vuetify-store',
6853
},
6954
{
7055
title: 'ui-kits',
71-
to: rpath('/resources/ui-kits/'),
72-
appendIcon: 'mdi-vector-difference-ab',
56+
href: 'https://store.vuetifyjs.com/products/vuetify-ui-kit-figma',
57+
appendIcon: '$vuetify-figma',
7358
},
7459
{ divider: true },
7560
{ subheader: t('social') },

packages/docs/src/components/app/bar/GitHubLink.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
icon="mdi-github"
66
rel="noopener"
77
target="_blank"
8+
v-tooltip:bottom="t('github')"
89
@click="sweClick('app-bar', 'github', name)"
910
/>
1011
</template>
1112

1213
<script setup>
1314
const { name } = useRoute()
15+
const { t } = useI18n()
1416
</script>

packages/docs/src/components/app/bar/LanguageMenu.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
color="medium-emphasis"
1010
icon="mdi-translate"
1111
v-bind="props"
12+
v-tooltip:bottom="t('languages')"
1213
/>
1314
</template>
1415
</AppMenuMenu>

packages/docs/src/components/app/bar/LearnMenu.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
},
7070
{ divider: true },
7171
{ subheader: t('documentation') },
72+
{
73+
title: 'Vuetify0',
74+
href: 'https://0.vuetifyjs.com/',
75+
appendIcon: 'mdi-numeric-0-box',
76+
},
7277
{
7378
title: '3.x (latest)',
7479
href: 'https://vuetifyjs.com/',

packages/docs/src/components/app/bar/SettingsToggle.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
:icon="app.settings ? 'mdi-cog' : 'mdi-cog-outline'"
2020
class="me-n2"
2121
color="medium-emphasis"
22+
v-tooltip:bottom="t('settings.header')"
2223
@click="onClick"
2324
/>
2425
</template>
@@ -27,6 +28,7 @@
2728
const app = useAppStore()
2829
const pwa = usePwaStore()
2930
const { name } = useRoute()
31+
const { t } = useI18n()
3032
3133
function onClick () {
3234
sweClick('app-bar', 'settings-toggle', name)

0 commit comments

Comments
 (0)