Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix/15721-select-…
Browse files Browse the repository at this point in the history
…list-items
  • Loading branch information
func0der committed Jun 12, 2024
2 parents abce796 + a30a859 commit 10e2aee
Show file tree
Hide file tree
Showing 54 changed files with 550 additions and 290 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.6.8",
"version": "3.6.9",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.6.8",
"version": "3.6.9",
"private": true,
"description": "",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.27",
"vuetify": "^3.6.8"
"vuetify": "^3.6.9"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
2 changes: 2 additions & 0 deletions packages/docs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ declare module 'vue' {
IntroductionComparison: typeof import('./src/components/introduction/Comparison.vue')['default']
IntroductionDirectSupport: typeof import('./src/components/introduction/DirectSupport.vue')['default']
IntroductionDiscordDeck: typeof import('./src/components/introduction/DiscordDeck.vue')['default']
'IntroductionDiscordDeck.1': typeof import('./src/components/introduction/DiscordDeck.1.vue')['default']
IntroductionEnterpriseDeck: typeof import('./src/components/introduction/EnterpriseDeck.vue')['default']
IntroductionEnterpriseForm: typeof import('./src/components/introduction/EnterpriseForm.vue')['default']
IntroductionSlaDeck: typeof import('./src/components/introduction/SlaDeck.vue')['default']
PageFeatures: typeof import('./src/components/PageFeatures.vue')['default']
PromotedBase: typeof import('./src/components/promoted/Base.vue')['default']
PromotedCarbon: typeof import('./src/components/promoted/Carbon.vue')['default']
Expand Down
6 changes: 3 additions & 3 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <john@vuetifyjs.com>",
"version": "3.6.8",
"version": "3.6.9",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand Down Expand Up @@ -38,7 +38,7 @@
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.16.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.8"
"vuetify": "^3.6.9"
},
"devDependencies": {
"@emailjs/browser": "^4.3.3",
Expand All @@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "^3.6.8",
"@vuetify/api-generator": "^3.6.9",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/api/ApiTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
name="row"
v-bind="{
props: {
class: 'bg-surface-bright'
style: 'background: rgba(0,0,0,.1)'
},
item,
}"
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/app/bar/EnterpriseLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:to="rpath('/introduction/enterprise-support/')"
class="ms-1"
color="primary"
text="enterprise"
text="support"
variant="outlined"
@click="gtagClick('app-bar', 'enterprise', name)"
/>
Expand Down
45 changes: 23 additions & 22 deletions packages/docs/src/components/examples/Example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
>
<AppSheet class="mb-9">
<v-lazy
v-if="!preview"
v-model="hasRendered"
min-height="44"
>
Expand Down Expand Up @@ -46,31 +45,33 @@

<v-spacer />

<v-tooltip
v-for="({ path, ...action }, i) of actions"
:key="i"
location="top"
>
<template #activator="{ props: tooltip }">
<v-fade-transition hide-on-leave>
<v-btn
v-show="!action.hide"
:key="action.icon"
class="me-2 text-medium-emphasis"
density="comfortable"
variant="text"
v-bind="mergeProps(action as any, tooltip)"
/>
</v-fade-transition>
</template>
<template v-if="!preview">
<v-tooltip
v-for="({ path, ...action }, i) of actions"
:key="i"
location="top"
>
<template #activator="{ props: tooltip }">
<v-fade-transition hide-on-leave>
<v-btn
v-show="!action.hide"
:key="action.icon"
class="me-2 text-medium-emphasis"
density="comfortable"
variant="text"
v-bind="mergeProps(action as any, tooltip)"
/>
</v-fade-transition>
</template>

<span>{{ t(path) }}</span>
</v-tooltip>
<span>{{ t(path) }}</span>
</v-tooltip>
</template>
</v-toolbar>
</v-lazy>

<div class="d-flex flex-column">
<v-expand-transition v-if="hasRendered">
<v-expand-transition v-if="hasRendered || preview">
<v-window v-show="showCode" v-model="template">
<v-window-item
v-for="(section, i) of sections"
Expand All @@ -88,7 +89,7 @@
</v-expand-transition>

<v-theme-provider
:class="showCode && 'border-t'"
:class="showCode && !preview && 'border-t'"
:theme="theme"
class="pa-2 rounded-b"
with-background
Expand Down
51 changes: 1 addition & 50 deletions packages/docs/src/components/introduction/DiscordDeck.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:text="tierText(tier)"
:variant="i === 1 ? 'flat' : 'outlined'"
class="mb-6 text-none"
color="primary"
color="#6458f2"
rel="noopener"
target="_blank"
block
Expand Down Expand Up @@ -76,25 +76,6 @@
const { mdAndUp } = useDisplay()
const tiers = [
{
name: 'Grass Tier',
price: 'Free',
href: 'https://community.vuetifyjs.com/',
src: 'https://cdn.vuetifyjs.com/docs/images/discord/tiers/grass.png',
text: 'Ask questions in our public Discord help channels.',
benefits: [
{
name: '#vuetify-3-help',
text: 'Ask questions and get help for Vuetify 3 from the community in this public channel.',
emoji: '3️⃣',
},
{
name: '#vuetify-2-help',
text: 'Ask questions and get help for Vuetify 2 from the community in this public channel.',
emoji: '2️⃣',
},
],
},
{
name: 'Wood Tier',
price: '$2.99',
Expand Down Expand Up @@ -152,36 +133,6 @@
text: 'Get a private help channel where you can ask questions to the Core Team.',
emoji: '🔨',
},
{
name: 'Priority GitHub Issues',
text: 'Get priority on your GitHub reported issues.',
emoji: '🚨',
},
],
},
{
name: 'Galaxy Tier',
contact: true,
price: '$199.99',
suffix: '/mo',
href: 'mailto:support@vuetifyjs.com?subject=Galaxy%20Tier%20Support%20Request',
src: 'https://cdn.vuetifyjs.com/docs/images/discord/tiers/galaxy.png',
text: 'Get support for up to 3 developers with a private help channel.',
benefits: [
{
text: 'Every channel in Planetary Tier plus:',
emoji: '💫',
},
{
name: 'Extra Developers',
text: 'Get a private help channel where up to 3 developers can ask questions directly to the Core Team.',
emoji: '🛠️',
},
{
name: 'Direct Support Discounts',
text: '50% discount on all Direct Support services.',
emoji: '🏷️',
},
],
},
]
Expand Down
143 changes: 143 additions & 0 deletions packages/docs/src/components/introduction/SlaDeck.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<template>
<v-sheet
border="s e b"
class="overflow-hidden"
max-width="900"
rounded
>
<v-divider
class="border-opacity-100"
color="primary"
thickness="4"
/>

<v-container class="py-9 px-5" fluid>
<v-row justify="space-around" dense>
<template v-for="(tier, i) in tiers" :key="i">
<v-col
:class="i === 1 && 'bg-primary'"
class="position-relative pa-4 rounded-lg"
cols="12"
md="4"
>
<v-responsive :min-height="mdAndUp ? 96 : undefined" class="mb-4">
<h3 class="d-flex align-center text-h6 font-weight-medium mb-4">
<v-avatar :image="tier.src" class="me-3" />

<div>
{{ tier.name }}

<div class="text-h5 font-weight-bold">
{{ tier.price }}<span v-if="tier.suffix" class="font-weight-medium opacity-60 text-body-2">{{ tier.suffix }}</span>
</div>
</div>
</h3>

<v-btn
:color="i === 1 ? 'surface' : 'primary'"
:href="tier.href"
:text="tierText(tier)"
:variant="i === 1 ? 'flat' : 'outlined'"
class="mb-6 text-none"
rel="noopener"
target="_blank"
block
/>

<div class="text-caption">{{ tier.text }}</div>
</v-responsive>

<v-divider class="mb-4" />

<ul class="text-caption ps-1" style="list-style-type: none;">
<li v-for="(benefit, k) in tier.benefits" :key="k" class="mb-2 d-flex">
<div class="me-2">{{ benefit.emoji }}</div>

<div>
<strong>{{ benefit.name }}</strong>

<div class="opacity-60">
{{ benefit.text }}
</div>
</div>
</li>
</ul>
</v-col>
</template>
</v-row>
</v-container>
</v-sheet>
</template>

<script setup>
const { mdAndUp } = useDisplay()
const tiers = [
{
name: 'Galaxy Tier',
price: '$250',
suffix: '/mo',
href: 'https://buy.stripe.com/cN2fZOfIE7xc4iA288',
src: 'https://cdn.vuetifyjs.com/docs/images/avatars/galaxy.png',
text: '🥉 For 2 developers',
benefits: [
{
name: 'Chat support',
text: 'Get a private Discord channel where your developers can ask questions directly to the Core Team.',
emoji: '💬',
},
{
name: 'Same day response',
text: 'Questions are answered within 24 hours, Monday through Friday.',
emoji: '🕒',
},
],
},
{
name: 'Cosmic Tier',
price: '$500',
suffix: '/mo',
href: 'https://buy.stripe.com/7sIfZO0NK3gW3ewfYZ',
src: 'https://cdn.vuetifyjs.com/docs/images/avatars/cosmic.png',
text: '🥈 For up to 5 developers',
benefits: [
{
name: 'Everything in Galaxy Tier, plus:',
emoji: '💫',
},
{
name: 'Priority bug fixes',
text: 'Get priority on reported or identified Vuetify GitHub issues.',
emoji: '🎯',
},
],
},
{
name: 'Multiverse Tier',
price: '$1,000',
suffix: '/mo',
href: 'https://buy.stripe.com/8wMeVKeEA04K8yQeUW',
src: 'https://cdn.vuetifyjs.com/docs/images/avatars/multiverse.png',
text: '🥇 For up to 15 developers',
benefits: [
{
name: 'Everything in Cosmic Tier, plus:',
emoji: '💫',
},
{
name: 'Monthly strategy session',
text: 'A monthly strategy session to discuss your project and how to best utilize Vuetify.',
emoji: '📅',
},
],
},
]
function tierText (tier) {
if (tier.trial) return 'Start free trial'
if (tier.price === 'Free') return 'Join Community'
if (tier.contact) return 'Contact Us'
return 'Subscribe'
}
</script>
1 change: 0 additions & 1 deletion packages/docs/src/data/301.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"customization/sass-variables": "/features/sass-variables",
"customization/theme": "/features/theme",
"about/sponsors-and-backers": "/introduction/sponsors-and-backers",
"components/application": "/features/application-layout",
"components/simple-tables": "/components/tables",
"components/data-tables": "/components/data-tables/basics",
"components/date-pickers-month": "/introduction/roadmap",
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/data/nav.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"routePath": "explorer",
"subtitle": "browse-components"
},
"application",
{ "divider": true },
{ "subheader": "containment" },
"bottom-sheets",
Expand Down
Loading

0 comments on commit 10e2aee

Please sign in to comment.