Skip to content

Commit 613319c

Browse files
committed
Merge branch 'next' into feat/new-homepage
2 parents 8751cb5 + 8b802c0 commit 613319c

File tree

25 files changed

+1049
-47
lines changed

25 files changed

+1049
-47
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.11.5"
16+
"version": "4.0.0-alpha.0"
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.5",
4+
"version": "4.0.0-alpha.0",
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 <john@vuetifyjs.com>",
7-
"version": "3.11.5",
7+
"version": "4.0.0-alpha.0",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",

packages/docs/src/components/app/Figure.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@
3030
inheritAttrs: false,
3131
}
3232
</script>
33+
34+
<style scoped>
35+
figure {
36+
margin: 0;
37+
}
38+
</style>

packages/docs/src/components/resources/Logos.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
width="125"
2121
/>
2222

23-
<div class="d-flex justify-center">
23+
<div class="d-flex justify-center mt-4">
2424
<v-btn
2525
:href="`${logo.src}.svg`"
2626
class="mx-1"
@@ -61,7 +61,7 @@
6161
cover
6262
/>
6363

64-
<div class="d-flex justify-center">
64+
<div class="d-flex justify-center mt-4">
6565
<v-btn
6666
:href="`${logo.src}.svg`"
6767
class="mx-1"

packages/docs/src/examples/v-date-picker/usage.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<v-date-picker
99
v-bind="props"
1010
v-model="date"
11-
:control-variant="variant"
1211
class="mx-auto"
1312
></v-date-picker>
1413

@@ -27,11 +26,11 @@
2726
// const hideActions = ref(false)
2827
const adjacent = ref(false)
2928
30-
const variant = toRef(() => model.value !== 'default' ? model.value : undefined)
29+
const controlVariant = toRef(() => model.value !== 'default' ? model.value : undefined)
3130
3231
const props = computed(() => {
3332
return {
34-
variant: variant.value,
33+
'control-variant': controlVariant.value,
3534
// 'hide-actions': hideActions.value || undefined,
3635
'show-adjacent-months': adjacent.value || undefined,
3736
}

0 commit comments

Comments
 (0)