Skip to content

Commit e3433ef

Browse files
AndreyYolkinAndreyYolkin
committed
chore: merge 'master' into ae-refresh-cli
2 parents 1f947a0 + 0fd9089 commit e3433ef

File tree

5 files changed

+203
-560
lines changed

5 files changed

+203
-560
lines changed

‎template/javascript/base/src/components/HelloWorld.vue

Lines changed: 41 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
<template>
2-
<v-container class="fill-height">
3-
<v-responsive
4-
class="align-centerfill-height mx-auto"
5-
max-width="900"
6-
>
2+
<v-container class="fill-height" max-width="900">
3+
<div>
74
<v-img
85
class="mb-4"
96
height="150"
107
src="@/assets/logo.png"
118
/>
129

13-
<div class="text-center">
14-
<div class="text-body-2 font-weight-light mb-n1">
15-
Welcome to
16-
</div>
17-
18-
<h1 class="text-h2 font-weight-bold">
19-
Vuetify
20-
</h1>
10+
<div class="mb-8 text-center">
11+
<div class="text-body-2 font-weight-light mb-n1">Welcome to</div>
12+
<h1 class="text-h2 font-weight-bold">Vuetify</h1>
2113
</div>
2214

23-
<div class="py-4" />
24-
2515
<v-row>
2616
<v-col cols="12">
2717
<v-card
@@ -30,7 +20,7 @@
3020
image="https://cdn.vuetifyjs.com/docs/images/one/create/feature.png"
3121
prepend-icon="mdi-rocket-launch-outline"
3222
rounded="lg"
33-
variant="outlined"
23+
variant="tonal"
3424
>
3525
<template #image>
3626
<v-img position="top right" />
@@ -44,120 +34,57 @@
4434

4535
<template #subtitle>
4636
<div class="text-subtitle-1">
47-
Replace this page by removing <v-kbd>{{ `<HelloWorld />` }}</v-kbd> in <v-kbd>pages/index.vue</v-kbd>.
37+
Change this page by updating <v-kbd>{{ `<HelloWorld />` }}</v-kbd> in <v-kbd>components/HelloWorld.vue</v-kbd>.
4838
</div>
4939
</template>
50-
51-
<v-overlay
52-
contained
53-
model-value
54-
opacity=".12"
55-
persistent
56-
scrim="primary"
57-
/>
58-
</v-card>
59-
</v-col>
60-
61-
<v-col cols="6">
62-
<v-card
63-
append-icon="mdi-open-in-new"
64-
class="py-4"
65-
color="surface-variant"
66-
href="https://vuetifyjs.com/"
67-
prepend-icon="mdi-text-box-outline"
68-
rel="noopener noreferrer"
69-
rounded="lg"
70-
subtitle="Learn about all things Vuetify in our documentation."
71-
target="_blank"
72-
title="Documentation"
73-
variant="text"
74-
>
75-
<v-overlay
76-
contained
77-
model-value
78-
opacity=".06"
79-
persistent
80-
scrim="primary"
81-
/>
82-
</v-card>
83-
</v-col>
84-
85-
<v-col cols="6">
86-
<v-card
87-
append-icon="mdi-open-in-new"
88-
class="py-4"
89-
color="surface-variant"
90-
href="https://vuetifyjs.com/introduction/why-vuetify/#feature-guides"
91-
prepend-icon="mdi-star-circle-outline"
92-
rel="noopener noreferrer"
93-
rounded="lg"
94-
subtitle="Explore available framework Features."
95-
target="_blank"
96-
title="Features"
97-
variant="text"
98-
>
99-
<v-overlay
100-
contained
101-
model-value
102-
opacity=".06"
103-
persistent
104-
scrim="primary"
105-
/>
10640
</v-card>
10741
</v-col>
10842

109-
<v-col cols="6">
43+
<v-col v-for="link in links" :key="link.href" cols="6">
11044
<v-card
11145
append-icon="mdi-open-in-new"
11246
class="py-4"
11347
color="surface-variant"
114-
href="https://vuetifyjs.com/components/all"
115-
prepend-icon="mdi-widgets-outline"
48+
:href="link.href"
49+
:prepend-icon="link.icon"
11650
rel="noopener noreferrer"
11751
rounded="lg"
118-
subtitle="Discover components in the API Explorer."
52+
:subtitle="link.subtitle"
11953
target="_blank"
120-
title="Components"
121-
variant="text"
122-
>
123-
<v-overlay
124-
contained
125-
model-value
126-
opacity=".06"
127-
persistent
128-
scrim="primary"
129-
/>
130-
</v-card>
131-
</v-col>
132-
133-
<v-col cols="6">
134-
<v-card
135-
append-icon="mdi-open-in-new"
136-
class="py-4"
137-
color="surface-variant"
138-
href="https://discord.vuetifyjs.com"
139-
prepend-icon="mdi-account-group-outline"
140-
rel="noopener noreferrer"
141-
rounded="lg"
142-
subtitle="Connect with Vuetify developers."
143-
target="_blank"
144-
title="Community"
145-
variant="text"
146-
>
147-
<v-overlay
148-
contained
149-
model-value
150-
opacity=".06"
151-
persistent
152-
scrim="primary"
153-
/>
154-
</v-card>
54+
:title="link.title"
55+
variant="tonal"
56+
/>
15557
</v-col>
15658
</v-row>
157-
</v-responsive>
59+
</div>
15860
</v-container>
15961
</template>
16062

16163
<script setup>
162-
//
64+
const links = [
65+
{
66+
href: 'https://vuetifyjs.com/',
67+
icon: 'mdi-text-box-outline',
68+
subtitle: 'Learn about all things Vuetify in our documentation.',
69+
title: 'Documentation',
70+
},
71+
{
72+
href: 'https://vuetifyjs.com/introduction/why-vuetify/#feature-guides',
73+
icon: 'mdi-star-circle-outline',
74+
subtitle: 'Explore available framework Features.',
75+
title: 'Features',
76+
},
77+
{
78+
href: 'https://vuetifyjs.com/components/all',
79+
icon: 'mdi-widgets-outline',
80+
subtitle: 'Discover components in the API Explorer.',
81+
title: 'Components',
82+
},
83+
{
84+
href: 'https://discord.vuetifyjs.com',
85+
icon: 'mdi-account-group-outline',
86+
subtitle: 'Connect with Vuetify developers.',
87+
title: 'Community',
88+
},
89+
]
16390
</script>

‎template/javascript/default/src/components/HelloWorld.vue

Lines changed: 38 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
<template>
2-
<v-container class="fill-height">
3-
<v-responsive
4-
class="align-centerfill-height mx-auto"
5-
max-width="900"
6-
>
2+
<v-container class="fill-height" max-width="900">
3+
<div>
74
<v-img
85
class="mb-4"
96
height="150"
107
src="@/assets/logo.png"
118
/>
129

13-
<div class="text-center">
10+
<div class="mb-8 text-center">
1411
<div class="text-body-2 font-weight-light mb-n1">Welcome to</div>
15-
1612
<h1 class="text-h2 font-weight-bold">Vuetify</h1>
1713
</div>
1814

19-
<div class="py-4" />
20-
2115
<v-row>
2216
<v-col cols="12">
2317
<v-card
@@ -26,7 +20,7 @@
2620
image="https://cdn.vuetifyjs.com/docs/images/one/create/feature.png"
2721
prepend-icon="mdi-rocket-launch-outline"
2822
rounded="lg"
29-
variant="outlined"
23+
variant="tonal"
3024
>
3125
<template #image>
3226
<v-img position="top right" />
@@ -43,117 +37,54 @@
4337
Change this page by updating <v-kbd>{{ `<HelloWorld />` }}</v-kbd> in <v-kbd>components/HelloWorld.vue</v-kbd>.
4438
</div>
4539
</template>
46-
47-
<v-overlay
48-
contained
49-
model-value
50-
opacity=".12"
51-
persistent
52-
scrim="primary"
53-
/>
54-
</v-card>
55-
</v-col>
56-
57-
<v-col cols="6">
58-
<v-card
59-
append-icon="mdi-open-in-new"
60-
class="py-4"
61-
color="surface-variant"
62-
href="https://vuetifyjs.com/"
63-
prepend-icon="mdi-text-box-outline"
64-
rel="noopener noreferrer"
65-
rounded="lg"
66-
subtitle="Learn about all things Vuetify in our documentation."
67-
target="_blank"
68-
title="Documentation"
69-
variant="text"
70-
>
71-
<v-overlay
72-
contained
73-
model-value
74-
opacity=".06"
75-
persistent
76-
scrim="primary"
77-
/>
78-
</v-card>
79-
</v-col>
80-
81-
<v-col cols="6">
82-
<v-card
83-
append-icon="mdi-open-in-new"
84-
class="py-4"
85-
color="surface-variant"
86-
href="https://vuetifyjs.com/introduction/why-vuetify/#feature-guides"
87-
prepend-icon="mdi-star-circle-outline"
88-
rel="noopener noreferrer"
89-
rounded="lg"
90-
subtitle="Explore available framework Features."
91-
target="_blank"
92-
title="Features"
93-
variant="text"
94-
>
95-
<v-overlay
96-
contained
97-
model-value
98-
opacity=".06"
99-
persistent
100-
scrim="primary"
101-
/>
10240
</v-card>
10341
</v-col>
10442

105-
<v-col cols="6">
43+
<v-col v-for="link in links" :key="link.href" cols="6">
10644
<v-card
10745
append-icon="mdi-open-in-new"
10846
class="py-4"
10947
color="surface-variant"
110-
href="https://vuetifyjs.com/components/all"
111-
prepend-icon="mdi-widgets-outline"
48+
:href="link.href"
49+
:prepend-icon="link.icon"
11250
rel="noopener noreferrer"
11351
rounded="lg"
114-
subtitle="Discover components in the API Explorer."
52+
:subtitle="link.subtitle"
11553
target="_blank"
116-
title="Components"
117-
variant="text"
118-
>
119-
<v-overlay
120-
contained
121-
model-value
122-
opacity=".06"
123-
persistent
124-
scrim="primary"
125-
/>
126-
</v-card>
127-
</v-col>
128-
129-
<v-col cols="6">
130-
<v-card
131-
append-icon="mdi-open-in-new"
132-
class="py-4"
133-
color="surface-variant"
134-
href="https://discord.vuetifyjs.com"
135-
prepend-icon="mdi-account-group-outline"
136-
rel="noopener noreferrer"
137-
rounded="lg"
138-
subtitle="Connect with Vuetify developers."
139-
target="_blank"
140-
title="Community"
141-
variant="text"
142-
>
143-
<v-overlay
144-
contained
145-
model-value
146-
opacity=".06"
147-
persistent
148-
scrim="primary"
149-
/>
150-
</v-card>
54+
:title="link.title"
55+
variant="tonal"
56+
/>
15157
</v-col>
15258
</v-row>
153-
</v-responsive>
59+
</div>
15460
</v-container>
15561
</template>
15662

15763
<script setup>
158-
//
64+
const links = [
65+
{
66+
href: 'https://vuetifyjs.com/',
67+
icon: 'mdi-text-box-outline',
68+
subtitle: 'Learn about all things Vuetify in our documentation.',
69+
title: 'Documentation',
70+
},
71+
{
72+
href: 'https://vuetifyjs.com/introduction/why-vuetify/#feature-guides',
73+
icon: 'mdi-star-circle-outline',
74+
subtitle: 'Explore available framework Features.',
75+
title: 'Features',
76+
},
77+
{
78+
href: 'https://vuetifyjs.com/components/all',
79+
icon: 'mdi-widgets-outline',
80+
subtitle: 'Discover components in the API Explorer.',
81+
title: 'Components',
82+
},
83+
{
84+
href: 'https://discord.vuetifyjs.com',
85+
icon: 'mdi-account-group-outline',
86+
subtitle: 'Connect with Vuetify developers.',
87+
title: 'Community',
88+
},
89+
]
15990
</script>

0 commit comments

Comments
 (0)