Skip to content

Update #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Oct 23, 2019
Merged

Update #992

merged 36 commits into from
Oct 23, 2019

Conversation

Jinjiang
Copy link
Member

@Jinjiang Jinjiang commented Oct 9, 2019

Silvan Wakker and others added 30 commits October 8, 2019 16:55
* Update index.md

It wasn't at first clear to me you should declare the component before instantiating your app. This hopefully makes that clear to even beginners.

* Update src/v2/guide/index.md

Co-Authored-By: Phan An <me@phanan.net>
* rel="nooper" where target blank

* fixed id conflict

* ensure aria label in search field

* force https

* display:swap for google fonts

* restore config

* revert formatting

* Revert indentation and coding style
* fix (#2297): Keep icon hidden on home page under side menu

* refactor (#2297): Remove duplicate z-index definition

* refactor (#2297): Setup base z-index manifest

* refactor (#2297): Abstract sidebar z-index baseline

* refactor (#2297): Establish base header z-index

* refactor (#2297): Establish z-index for overlay and modals
* fix (#2299): Remove duplicate entries on non-home pages

* fix (#2299): Improve spacing for sponsors on mobile

* fix (#2299): Align sponsors with content on desktop

* refactor (#2299): Standardize content padding vertical

* fix (#2299): Improve spacing for clicking on mobile for last sidebar item
* Vue.JS Partners: Modus Create

* Updated copy and UTM

* shorter description

* added youtube
(In the U.S. common practice is to place the dollar symbol before the numeric value.)
* docs: add Rolf Haug

* feat: add Oslo latitude and longtitude + Norwegian language variable
@Jinjiang Jinjiang requested a review from Justineo October 9, 2019 15:37
@@ -77,6 +77,8 @@ Vue 提供了一个[官方的 CLI](https://github.com/vuejs/vue-cli),为单页

<p class="tip">CLI 工具假定用户对 Node.js 和相关构建工具有一定程度的了解。如果你是新手,我们强烈建议先在不用构建工具的情况下通读<a href="./">指南</a>,在熟悉 Vue 本身之后再使用 CLI。</p>

<div class="vue-mastery"><a href="https://www.vuemastery.com/courses/real-world-vue-js/vue-cli" target="_blank" rel="sponsored noopener" title="Vue CLI">Watch a video explanation on Vue Mastery</a></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="vue-mastery"><a href="https://www.vuemastery.com/courses/real-world-vue-js/vue-cli" target="_blank" rel="sponsored noopener" title="Vue CLI">Watch a video explanation on Vue Mastery</a></div>
<div class="vue-mastery"><a href="https://www.vuemastery.com/courses/real-world-vue-js/vue-cli" target="_blank" rel="sponsored noopener" title="Vue CLI">Vue Mastery 观看视频讲解</a></div>

@@ -126,7 +126,11 @@ vm.$watch('a', function (newValue, oldValue) {

## 实例生命周期钩子

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

@@ -8,6 +8,8 @@ order: 601

## 如何追踪变化

<div class="vue-mastery"><a href="https://www.vuemastery.com/courses/advanced-components/build-a-reactivity-system" target="_blank" rel="sponsored noopener" title="Vue Reactivity">Watch a video explanation on Vue Mastery</a></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

@@ -60,7 +60,7 @@ order: 401

有了 `.vue` 组件,我们就进入了高级 JavaScript 应用领域。如果你没有准备好的话,意味着还需要学会使用一些附加的工具:

- **Node Package Manager (NPM)**:阅读 [Getting Started guide](https://docs.npmjs.com/getting-started/what-is-npm) 直到 *10: Uninstalling global packages*章节
- **Node Package Manager (NPM)**:阅读 [Getting Started guide](https://docs.npmjs.com/packages-and-modules/getting-packages-from-the-registry) 中关于如何从注册地 (registry) 获取包的章节
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe “注册服务”?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

那相比还是注册地好一些,主观感觉。。。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

除了这个地方别的都已经更新了:)

@@ -8,6 +8,8 @@ order: 502

由于状态零散地分布在许多组件和组件之间的交互中,大型应用复杂度也经常逐渐增长。为了解决这个问题,Vue 提供 [vuex](https://github.com/vuejs/vuex):我们有受到 Elm 启发的状态管理库。vuex 甚至集成到 [vue-devtools](https://github.com/vuejs/vue-devtools),无需配置即可进行[时光旅行调试 (time travel debugging)](https://raw.githubusercontent.com/vuejs/vue-devtools/master/media/demo.gif)。

<div class="vue-mastery"><a href="https://www.vuemastery.com/courses/mastering-vuex/intro-to-vuex/" target="_blank" rel="sponsored noopener" title="Vuex Tutorial">Watch a video explanation on Vue Mastery</a></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

@@ -11,7 +11,7 @@
<% if (page.type) { %>
<% if (page.type === 'menu') { %>
<form id="search-form">
<input type="text" id="search-query-menu" class="search-query st-default-search-input">
<input type="text" id="search-query-menu" aria-label="搜索 Vue.JS 站点" class="search-query st-default-search-input">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<input type="text" id="search-query-menu" aria-label="搜索 Vue.JS 站点" class="search-query st-default-search-input">
<input type="text" id="search-query-menu" aria-label="搜索 Vue.js 站点" class="search-query st-default-search-input">

@Justineo Justineo merged commit 0bf79fb into master Oct 23, 2019
@Jinjiang Jinjiang deleted the update branch October 23, 2019 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.