Skip to content
This repository was archived by the owner on Aug 8, 2022. It is now read-only.

Commit df7562a

Browse files
authored
Merge pull request #163 from vuejs/jinjiang/update
sync: #26964a5
2 parents 9c55398 + 3c98183 commit df7562a

File tree

14 files changed

+830
-497
lines changed

14 files changed

+830
-497
lines changed

.github/pull_request_template.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
# ⚠️⚠️⚠️ DISCLAIMER ⚠️⚠️⚠️:
1+
## Description of Problem
22

3-
Thanks for your interest in submitting a PR! At this time, because the docs are in beta, the team is currently in the midst of changes. As a result, **we are not ready for additional contributions yet**.
3+
## Proposed Solution
44

5-
## How can I provide feedback?
6-
7-
To be respectful of your time and ideas, **please [create an issue](https://github.com/vuejs/docs-next/issues/new) instead of a pull request**. Otherwise, we will have to simply close your pull request at this time.
8-
9-
Thanks for your understanding!
5+
## Additional Information

assets/transitions-diagram.ai.zip

1.14 MB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"@vuepress/plugin-pwa": "^1.5.4",
44
"node-sass": "^4.13.1",
55
"sass-loader": "^8.0.2",
6-
"vuepress": "^1.3.0"
6+
"vuepress": "^1.5.4"
77
},
88
"scripts": {
99
"dev": "yarn serve",

src/.vuepress/components/BetaBanner.vue renamed to src/.vuepress/components/AppBanner.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<template>
22
<ClientOnly>
3-
<aside class="beta-banner" v-if="shouldShow">
4-
<p>
5-
<span class="hide-sm">⚠️ Beta Version:</span>
6-
Docs
7-
<span class="hide-sm">are</span> in development and subject to change.
8-
</p>
3+
<aside class="app-banner" v-if="shouldShow">
4+
<slot></slot>
95
<button ref="closeButton" @click="close">Close</button>
106
</aside>
117
</ClientOnly>
@@ -39,7 +35,7 @@ export default {
3935
<style lang="scss" scoped>
4036
@import '../theme/styles/mixins.scss';
4137
42-
.beta-banner {
38+
.app-banner {
4339
position: fixed;
4440
z-index: 21;
4541
top: 0;

src/.vuepress/components/common/vuemastery-video-modal.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
target="_blank"
1212
rel="sponsored noopener"
1313
title="Vue.js Courses on Vue Mastery"
14-
>Vue Mastery</a>.
15-
Watch Vue Mastery’s free
14+
>Vue Mastery</a
15+
>. Watch Vue Mastery’s free
1616
<a
17-
href="https://www.vuemastery.com/courses/intro-to-vue-js/vue-instance/"
17+
href="https://www.vuemastery.com/courses/intro-to-vue-3/intro-to-vue3"
1818
target="_blank"
1919
rel="sponsored noopener"
2020
title="Vue.js Courses on Vue Mastery"
21-
>Intro to Vue course</a>.
21+
>Intro to Vue course</a
22+
>.
2223
</p>
2324
</div>
2425
</div>
@@ -60,7 +61,7 @@ export default {
6061
}
6162
},
6263
63-
mounted () {
64+
mounted() {
6465
if (typeof window !== 'undefined') {
6566
this.initVideoModal()
6667
}
@@ -69,7 +70,7 @@ export default {
6970
</script>
7071

7172
<style lang="scss">
72-
@import "@theme/styles/_settings.scss";
73+
@import '@theme/styles/_settings.scss';
7374
7475
.modal {
7576
box-sizing: border-box;

src/.vuepress/config.js

Lines changed: 56 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
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: '基础',
912
collapsable: false,
1013
children: [
@@ -60,7 +63,8 @@ const sidebar = {
6063
{
6164
title: '高阶指南',
6265
collapsable: false,
63-
children: [{
66+
children: [
67+
{
6468
title: '响应性',
6569
children: [
6670
'/guide/reactivity',
@@ -88,7 +92,8 @@ const sidebar = {
8892
children: [
8993
'/guide/single-file-component',
9094
'/guide/testing',
91-
'/guide/typescript-support'
95+
'/guide/typescript-support',
96+
'/guide/mobile'
9297
]
9398
},
9499
{
@@ -177,21 +182,23 @@ const sidebar = {
177182
},
178183
'/api/composition-api'
179184
],
180-
examples: [{
181-
title: '示例',
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-
}]
185+
examples: [
186+
{
187+
title: '示例',
188+
collapsable: false,
189+
children: [
190+
'/examples/markdown',
191+
'/examples/commits',
192+
'/examples/grid-component',
193+
'/examples/tree-view',
194+
'/examples/svg',
195+
'/examples/modal',
196+
'/examples/elastic-header',
197+
'/examples/select2',
198+
'/examples/todomvc'
199+
]
200+
}
201+
]
195202
}
196203

197204
module.exports = {
@@ -201,22 +208,27 @@ module.exports = {
201208
[
202209
'link',
203210
{
204-
href: 'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Open+Sans:400,600;display=swap',
211+
href:
212+
'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Open+Sans:400,600;display=swap',
205213
rel: 'stylesheet'
206214
}
207215
],
208216
[
209217
'link',
210218
{
211-
href: 'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
219+
href:
220+
'https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
212221
rel: 'stylesheet'
213222
}
214223
],
215-
['link', {
216-
rel: 'icon',
217-
href: '/logo.png'
218-
}],
219-
['link', { rel: 'manifest', href: '/manifest.json' }],
224+
[
225+
'link',
226+
{
227+
rel: 'icon',
228+
href: '/logo.png'
229+
}
230+
],
231+
['link', { rel: 'manifest', href: '/manifest.json' }],
220232
['meta', { name: 'theme-color', content: '#3eaf7c' }],
221233
['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }],
222234
[
@@ -248,10 +260,12 @@ module.exports = {
248260
],
249261
themeConfig: {
250262
logo: '/logo.png',
251-
nav: [{
263+
nav: [
264+
{
252265
text: '文档',
253266
ariaLabel: '文档菜单',
254-
items: [{
267+
items: [
268+
{
255269
text: '教程',
256270
link: '/guide/introduction'
257271
},
@@ -279,10 +293,12 @@ module.exports = {
279293
},
280294
{
281295
text: '生态系统',
282-
items: [{
296+
items: [
297+
{
283298
text: '社区',
284299
ariaLabel: '社区菜单',
285-
items: [{
300+
items: [
301+
{
286302
text: '团队',
287303
link: '/community/team/'
288304
},
@@ -302,7 +318,8 @@ module.exports = {
302318
},
303319
{
304320
text: '官方项目',
305-
items: [{
321+
items: [
322+
{
306323
text: 'Vue Router',
307324
link: 'https://next.router.vuejs.org/'
308325
},
@@ -316,7 +333,8 @@ module.exports = {
316333
},
317334
{
318335
text: 'Vue Test Utils',
319-
link: 'https://vuejs.github.io/vue-test-utils-next-docs/guide/introduction.html'
336+
link:
337+
'https://vuejs.github.io/vue-test-utils-next-docs/guide/introduction.html'
320338
},
321339
{
322340
text: 'Devtools',
@@ -333,7 +351,8 @@ module.exports = {
333351
{
334352
text: '支持 Vue',
335353
link: '/support-vuejs/',
336-
items: [{
354+
items: [
355+
{
337356
text: '一次性捐款',
338357
link: '/support-vuejs/#one-time-donations'
339358
},

0 commit comments

Comments
 (0)