Skip to content

Commit f391590

Browse files
authored
Merge branch 'master' into master
2 parents f907b17 + 8976555 commit f391590

File tree

91 files changed

+10218
-978
lines changed

Some content is hidden

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

91 files changed

+10218
-978
lines changed

.github/pull_request_template.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
## Description of Problem
1+
<!-- Coloque quaisquer detalhes adicionais -->
22

3-
## Proposed Solution
4-
5-
## Additional Information
3+
<!-- Anexe a issue que esta contribuição resolverá -->
4+
closes #?

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"devDependencies": {
3+
"@vuepress/plugin-pwa": "^1.5.4",
34
"node-sass": "^4.13.1",
45
"sass-loader": "^8.0.2",
56
"vuepress": "^1.5.4"

src/.vuepress/components/common/codepen-snippet.vue

Lines changed: 68 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,99 @@
11
<template>
2-
<p class="codepen" data-height="300" data-theme-id="39028" data-default-tab="result" data-preview="true" data-editable="true"
3-
:data-user="user.slug"
4-
:data-slug-hash="slug"
5-
:data-pen-title="title">
6-
<span>Veja o exemplo <a :href="`https://codepen.io/${user.slug}/pen/${slug}`">
7-
{{ title }}</a> por {{ user.name }} (<a :href="`https://codepen.io/${user.slug}`">@${user.slug}</a>)
8-
no <a href="https://codepen.io">CodePen</a>.</span>
2+
<p
3+
class="codepen"
4+
:data-theme-id="theme"
5+
:data-preview="preview || null"
6+
:data-editable="editable || null"
7+
:data-height="height"
8+
:data-default-tab="tab"
9+
:data-user="user"
10+
:data-slug-hash="slug"
11+
:data-pen-title="title"
12+
:data-embed-version="version"
13+
:style="`height: ${height}px`">
14+
<span>See the Pen <a :href="href">{{ title }}</a>
15+
by {{ name || user }} (<a :href="`https://codepen.io/${user}`">@{{user}}</a>)
16+
on <a href="https://codepen.io">CodePen</a>.</span>
917
</p>
1018
</template>
1119

1220
<script>
1321
export default {
1422
props: {
15-
user: {
16-
type: Object,
17-
default: () => ({
18-
slug: 'vuejs-br',
19-
name: 'Vue.js Brasil'
20-
}),
21-
},
22-
2323
title: {
2424
type: String,
2525
default: null,
26+
required: true,
2627
},
2728
2829
slug: {
2930
type: String,
3031
default: null,
32+
required: true,
33+
},
34+
35+
tab: {
36+
type: String,
37+
default: 'result',
38+
},
39+
40+
team: {
41+
type: Boolean,
42+
default: true,
43+
},
44+
45+
user: {
46+
type: String,
47+
default: 'Vue',
48+
},
49+
50+
name: {
51+
type: String,
52+
default: null,
53+
},
54+
55+
height: {
56+
type: Number,
57+
default: 300,
58+
},
59+
60+
theme: {
61+
type: String,
62+
default: '39028',
63+
},
64+
65+
preview: {
66+
type: Boolean,
67+
default: true,
3168
},
69+
70+
editable: {
71+
type: Boolean,
72+
default: true,
73+
},
74+
75+
version: {
76+
type: String,
77+
default: null,
78+
}
3279
},
3380
mounted() {
3481
const codepenScript = document.createElement('script')
3582
codepenScript.setAttribute('src', 'https://static.codepen.io/assets/embed/ei.js')
3683
codepenScript.async = true
3784
this.$el.appendChild(codepenScript)
38-
}
85+
},
86+
computed: {
87+
href() {
88+
return `https://codepen.io/${this.team ? 'team' : ''}${this.user}/pen/${this.slug}`
89+
}
90+
},
3991
}
4092
</script>
4193

4294
<style lang="scss">
4395
.codepen {
4496
box-sizing: border-box;
45-
height: 300px;
4697
display: flex;
4798
align-items: center;
4899
justify-content: center;

src/.vuepress/components/community/team/members.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ const members = [
252252
languages: ['uk', 'ru', 'en'],
253253
reposOfficial: ['vuejs.org', 'vue-cli'],
254254
work: {
255-
role: 'Senior Frontend Engineer',
255+
role: 'Staff Frontend Engineer',
256256
org: 'GitLab',
257257
orgUrl: 'https://gitlab.com/'
258258
},

src/.vuepress/config.js

Lines changed: 81 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
const sidebar = {
2-
cookbook: [{
3-
title: 'Cookbook',
4-
collapsable: false,
5-
children: ['/cookbook/', '/cookbook/editable-svg-icons']
6-
}],
7-
guide: [{
2+
cookbook: [
3+
{
4+
title: 'Cookbook',
5+
collapsable: false,
6+
children: ['/cookbook/', '/cookbook/editable-svg-icons']
7+
}
8+
],
9+
guide: [
10+
{
811
title: 'Essentials',
912
collapsable: false,
1013
children: [
1114
'/guide/installation',
1215
'/guide/introduction',
1316
'/guide/instance',
1417
'/guide/template-syntax',
18+
'/guide/data-methods',
1519
'/guide/computed',
1620
'/guide/class-and-style',
1721
'/guide/conditional',
@@ -60,7 +64,8 @@ const sidebar = {
6064
{
6165
title: 'Advanced Guides',
6266
collapsable: false,
63-
children: [{
67+
children: [
68+
{
6469
title: 'Reactivity',
6570
children: [
6671
'/guide/reactivity',
@@ -88,7 +93,8 @@ const sidebar = {
8893
children: [
8994
'/guide/single-file-component',
9095
'/guide/testing',
91-
'/guide/typescript-support'
96+
'/guide/typescript-support',
97+
'/guide/mobile'
9298
]
9399
},
94100
{
@@ -151,6 +157,7 @@ const sidebar = {
151157
'/api/global-api',
152158
{
153159
title: 'Options',
160+
path: '/api/options-api',
154161
collapsable: false,
155162
children: [
156163
'/api/options-data',
@@ -168,6 +175,7 @@ const sidebar = {
168175
'/api/built-in-components.md',
169176
{
170177
title: 'Reactivity API',
178+
path: '/api/reactivity-api',
171179
collapsable: false,
172180
children: [
173181
'/api/basic-reactivity',
@@ -177,21 +185,23 @@ const sidebar = {
177185
},
178186
'/api/composition-api'
179187
],
180-
examples: [{
181-
title: 'Examples',
182-
collapsable: false,
183-
children: [
184-
'/examples/markdown',
185-
'/examples/commits',
186-
'/examples/grid-component',
187-
'/examples/tree-view',
188-
'/examples/svg',
189-
'/examples/modal',
190-
'/examples/elastic-header',
191-
'/examples/select2',
192-
'/examples/todomvc'
193-
]
194-
}]
188+
examples: [
189+
{
190+
title: 'Examples',
191+
collapsable: false,
192+
children: [
193+
'/examples/markdown',
194+
'/examples/commits',
195+
'/examples/grid-component',
196+
'/examples/tree-view',
197+
'/examples/svg',
198+
'/examples/modal',
199+
'/examples/elastic-header',
200+
'/examples/select2',
201+
'/examples/todomvc'
202+
]
203+
}
204+
]
195205
}
196206

197207
module.exports = {
@@ -201,21 +211,48 @@ module.exports = {
201211
[
202212
'link',
203213
{
204-
href: 'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Open+Sans:400,600;display=swap',
214+
href:
215+
'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Open+Sans:400,600;display=swap',
205216
rel: 'stylesheet'
206217
}
207218
],
208219
[
209220
'link',
210221
{
211-
href: 'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
222+
href:
223+
'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
212224
rel: 'stylesheet'
213225
}
214226
],
215-
['link', {
216-
rel: 'icon',
217-
href: '/logo.png'
218-
}],
227+
[
228+
'link',
229+
{
230+
rel: 'icon',
231+
href: '/logo.png'
232+
}
233+
],
234+
['link', { rel: 'manifest', href: '/manifest.json' }],
235+
['meta', { name: 'theme-color', content: '#3eaf7c' }],
236+
['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }],
237+
[
238+
'meta',
239+
{ name: 'apple-mobile-web-app-status-bar-style', content: 'black' }
240+
],
241+
[
242+
'link',
243+
{
244+
rel: 'apple-touch-icon',
245+
href: '/images/icons/apple-icon-152x152.png'
246+
}
247+
],
248+
[
249+
'meta',
250+
{
251+
name: 'msapplication-TileImage',
252+
content: '/images/icons/ms-icon-144x144.png'
253+
}
254+
],
255+
['meta', { name: 'msapplication-TileColor', content: '#000000' }],
219256
[
220257
'script',
221258
{
@@ -232,10 +269,12 @@ module.exports = {
232269
],
233270
themeConfig: {
234271
logo: '/logo.png',
235-
nav: [{
272+
nav: [
273+
{
236274
text: 'Docs',
237275
ariaLabel: 'Documentation Menu',
238-
items: [{
276+
items: [
277+
{
239278
text: 'Guide',
240279
link: '/guide/introduction'
241280
},
@@ -259,14 +298,16 @@ module.exports = {
259298
},
260299
{
261300
text: 'API Reference',
262-
link: '/api/application-config'
301+
link: '/api/'
263302
},
264303
{
265304
text: 'Ecosystem',
266-
items: [{
305+
items: [
306+
{
267307
text: 'Community',
268308
ariaLabel: 'Community Menu',
269-
items: [{
309+
items: [
310+
{
270311
text: 'Team',
271312
link: '/community/team/'
272313
},
@@ -286,7 +327,8 @@ module.exports = {
286327
},
287328
{
288329
text: 'Official Projects',
289-
items: [{
330+
items: [
331+
{
290332
text: 'Vue Router',
291333
link: 'https://next.router.vuejs.org/'
292334
},
@@ -300,7 +342,8 @@ module.exports = {
300342
},
301343
{
302344
text: 'Vue Test Utils',
303-
link: 'https://vuejs.github.io/vue-test-utils-next-docs/guide/introduction.html'
345+
link:
346+
'https://vuejs.github.io/vue-test-utils-next-docs/guide/introduction.html'
304347
},
305348
{
306349
text: 'Devtools',
@@ -317,7 +360,8 @@ module.exports = {
317360
{
318361
text: 'Support Vue',
319362
link: '/support-vuejs/',
320-
items: [{
363+
items: [
364+
{
321365
text: 'One-time Donations',
322366
link: '/support-vuejs/#one-time-donations'
323367
},

src/.vuepress/public/images/css-vs-js-ease.svg

Lines changed: 1 addition & 1 deletion
Loading
3.36 KB
Loading
4.1 KB
Loading
849 Bytes
Loading
1.19 KB
Loading

0 commit comments

Comments
 (0)