Merge commit '9d5c0295ecf3f0c913b9d198f3f9b653f02ae8ab' into 2.0-cn

* commit '9d5c0295ecf3f0c913b9d198f3f9b653f02ae8ab':
  fix support page mobile sidebar
  tweak mobile
  update runtime build info
  tweak position
  responsive css
  redesign homepage
  2.0.0-rc.8
  update makefile
  update src links
  Update index.md (vuejs#421)

# Conflicts:
#	src/guide/index.md
#	src/guide/installation.md
#	themes/vue/_config.yml
#	themes/vue/layout/index.ejs
#	themes/vue/layout/layout.ejs
#	themes/vue/layout/partials/header.ejs
#	themes/vue/layout/partials/main_menu.ejs
#	themes/vue/layout/partials/sponsors.ejs
#	themes/vue/source/css/page.styl

Author: dingyiming

Makefile

@@ -3,13 +3,12 @@ all: update deploy
 deploy:
 	rm -f db.json
 	hexo generate
-	cp -R ./todomvc public/examples
 	hexo deploy
 
 update:
 	cd ../vue && \
 		git checkout -- dist && \
-		git checkout next && \
+		git checkout dev && \
 		npm run build
 	cp ../vue/dist/vue.min.js themes/vue/source/js/vue.min.js
 	cp ../vue/dist/vue.js themes/vue/source/js/vue.js

src/api/index.md

@@ -1780,8 +1780,8 @@ type: api
 
 ## VNode Interface
 
-- Please refer to the [VNode class declaration](https://github.com/vuejs/vue/blob/next/src/core/vdom/vnode.js).
+- Please refer to the [VNode class declaration](https://github.com/vuejs/vue/blob/dev/src/core/vdom/vnode.js).
 
 ## Server-Side Rendering
 
-- Please refer to the [vue-server-renderer package documentation](https://github.com/vuejs/vue/tree/next/packages/vue-server-renderer).
+- Please refer to the [vue-server-renderer package documentation](https://github.com/vuejs/vue/tree/dev/packages/vue-server-renderer).

src/blog/index.md

@@ -213,7 +213,7 @@ React is renowned for its steep learning curve. Before you can really get starte
 While Vue scales up just as well as, if not better than React, it also scales down just as well as jQuery. That's right - all you have to do is drop a single script tag into a page:
 
 ``` html
-<script src="https://unpkg.com/vue@next/dist/vue.js"></script>
+<script src="https://unpkg.com/vue/dist/vue.js"></script>
 ```
 
 Then you can start writing Vue code and even ship the minified version to production without feeling guilty or having to worry about performance problems.
@@ -268,7 +268,7 @@ We have a separate section for Angular 2 because it really is a completely new f
 
 While Angular 1 could be used for smaller applications, Angular 2 has shifted focus to best facilitate large enterprise applications. As part of this, it almost requires TypeScript, which can be very useful for developers that desire the type safety of languages such as Java and C#.
 
-Vue is also well-suited to [enterprise environments](https://github.com/vuejs/awesome-vue#enterprise-usage) and can even be used with TypeScript via our [official typings](https://github.com/vuejs/vue/tree/next/types) and [user-contributed decorators](https://github.com/itsFrank/vue-typescript), though it's definitely optional in our case.
+Vue is also well-suited to [enterprise environments](https://github.com/vuejs/awesome-vue#enterprise-usage) and can even be used with TypeScript via our [official typings](https://github.com/vuejs/vue/tree/dev/types) and [user-contributed decorators](https://github.com/itsFrank/vue-typescript), though it's definitely optional in our case.
 
 ### Size and Performance
 

src/guide/comparison.md

@@ -346,7 +346,8 @@ var app7 = new Vue({
 
 1.Web 组件规范仍然远未完成，并且没有浏览器实现。相比之下，Vue.js 组件不需要任何补丁，并且在所有支持的浏览器（IE9 及更高版本）之下表现一致。必要时，Vue.js 组件也可以放在原生自定义元素之内。
 
-2.Vue.js 组件提供了原生自定义元素所不具备的一些重要功能，比如组件间的数据流，自定义事件系统，以及动态的、带特效的组件替换。
+2.Vue.js 组件提供了原生自定义元素所不具备的一些重要功能，比如组件间的数据流，自定义事件系统，以及构建工具的继承。
+
 
 ## 准备好了吗?
 

src/guide/index.md

@@ -2,10 +2,10 @@
 title: 安装
 type: guide
 order: 1
-vue_version: 2.0.0-rc.7
-dev_size: "184"
-min_size: "64"
-gz_size: "22"
+vue_version: 2.0.0-rc.8
+dev_size: "183.80"
+min_size: "61.54"
+gz_size: "22.53"
 ---
 
 ### 兼容性
@@ -30,43 +30,46 @@ Vue.js 不支持 IE8 及其以下版本，因为 Vue.js 使用了 IE8 不能实
 
 ### CDN
 
-可以从 [jsdelivr](http://cdn.jsdelivr.net/vue/2.0.0-rc.1/vue.min.js) 或 [cdnjs](http://cdnjs.cloudflare.com/ajax/libs/vue/2.0.0-rc.1/vue.min.js) 获取（版本更新可能略滞后）。
+Recommended: [unpkg](https://unpkg.com/vue), which will reflect the latest version as soon as it is published to npm. You can also browse the source of the npm package at [unpkg.com/vue/](https://unpkg.com/vue/).
 
-### CSP 兼容版本
-
-可以在 [unpkg](https://unpkg.com/vue/dist/vue.min.js) 获取，会和npm一样保持最新版本，也可以在[unpkg.com/vue/](https://unpkg.com/vue/)浏览npm包资源。
-
-有些环境，如 Google Chrome Apps，强制应用内容安全策略 (CSP) ，不能使用 `new Function()` 对表达式求值。独立构建编译模板时依赖这个特性，所以不能在这类环境下使用。
-
-然而，有个解决方案，当用webpack+vue-loader或者Browserify+vueify构建vue应用时，你的模板将被编译进`render`函数实现完美运作在CSP环境中。
+Also available on [jsdelivr](//cdn.jsdelivr.net/vue/{{vue_version}}/vue.js) or [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js), but these two services take some time to sync so the latest release may not be available yet.
 
 ## NPM
 
 在用 Vue.js 构建大型应用时推荐使用 NPM 安装，NPM 能很好地和诸如 [Webpack](http://webpack.github.io/) 或 [Browserify](http://browserify.org/) 的 CommonJS 模块打包器配合使用。Vue.js 也提供配套工具来开发[单文件组件](application.html#单文件组件)。
 
 ``` bash
 # 最新稳定版
-$ npm install vue@next
+$ npm install vue
 ```
 
-### 用 npm 构建时注意
+### Standalone vs. Runtime-only Build
+
+There are two builds available, the standalone build and the runtime-only build.
 
+- The standalone build includes the compiler and supports the `template` option.
 
-由于在构建时单个组件预编译模板进入渲染函数，所以默认导出的`vue` npm 包是 **只在运行环境下使用的**，它不支持`template`选项。如你希望使用`template`选项，你需要配置你的构建工具软连接`vue`单独构建。
+- The runtime-only build does not include the template compiler, and does not support the `template` option. You can only use the `render` option when using the runtime-only build, but it works with single-file components, because single-file components' templates are pre-compiled into `render` functions during the build step. The runtime-only build is roughly 30% lighter-weight than the standalone build, weighing only 16kb min+gzip.
 
-用webpack，添加下面的配置:
+By default, the NPM package exports the standalone build. To use the runtime-only build, add the following alias to your webpack config:
 
 ``` js
 resolve: {
   alias: {
-    vue: 'vue/dist/vue.js'
+    vue: 'vue/dist/vue.common.js'
   }
 }
 ```
 
 对于Browserify,可以用 [aliasify](https://github.com/benbria/aliasify) 
 
-<p class="tip">不要用`import Vue from 'vue/dist/vue` - 因为一些工具或第三方库可能z正常引入vue,这样做可能导致应用程序运行时和独立的构建导致错误。</p>
+<p class="tip">Do NOT do `import Vue from 'vue/dist/vue.common.js'` - since some tools or 3rd party libraries may import vue as well, this may cause the app to load both the runtime and standalone builds at the same time and lead to errors.</p>
+
+### CSP environments
+
+Some environments, such as Google Chrome Apps, enforce Content Security Policy (CSP), which prohibits the use of `new Function()` for evaluating expressions. The standalone build depends on this feature to compile templates, so is unusable in these environments.
+
+On the other hand, the runtime-only build is fully CSP-compliant. When using the runtime-only build with [Webpack + vue-loader](https://github.com/vuejs-templates/webpack-simple-2.0) or [Browserify + vueify](https://github.com/vuejs-templates/browserify-simple-2.0), your templates will be precompiled into `render` functions which work perfectly in CSP environments.
 
 ## 命令行工具
 
@@ -86,12 +89,11 @@ $ npm run dev
 
 ## 开发版本
 
-**重要**：发布到 NPM 上的 CommonJS 包 (`vue.common.js`) 只在发布新版本时签入 `next` 分支，想使用 GitHub 上最新的源码，需要自己编译：
+**Important**: the built files in GitHub's `/dist` folder are only checked-in during releases. To use Vue from the latest source code on GitHub, you will have to build it yourself!
 
 ``` bash
 git clone https://github.com/vuejs/vue.git node_modules/vue
 cd node_modules/vue
-git checkout next
 npm install
 npm run build
 ```
@@ -100,7 +102,7 @@ npm run build
 
 ``` bash
 # 最新稳定版本
-$ bower install vue#next
+$ bower install vue
 ```
 
 ## AMD 模块加载器

src/guide/installation.md

@@ -99,3 +99,25 @@ NODE_ENV=production browserify -g envify -e main.js | uglifyjs -c -m > build.js
 ``` bash
 NODE_ENV=production browserify -g envify -p [ vueify/plugins/extract-css -o build.css ] -e main.js | uglifyjs -c -m > build.js
 ```
+
+### Use the Runtime-Only Build
+
+There are two builds available, the standalone build and the runtime-only build.
+
+- The standalone build includes the compiler and supports the `template` option.
+
+- The runtime-only build does not include the template compiler, and does not support the `template` option. You can only use the `render` option when using the runtime-only build, but it works with single-file components, because single-file components' templates are pre-compiled into `render` functions during the build step. The runtime-only build is roughly 30% lighter-weight than the standalone build, weighing only 16kb min+gzip.
+
+By default, the NPM package exports the standalone build. To use the runtime-only build, add the following alias to your webpack config:
+
+``` js
+resolve: {
+  alias: {
+    vue: 'vue/dist/vue.common.js'
+  }
+}
+```
+
+For Browserify, you can use [aliasify](https://github.com/benbria/aliasify) to achieve the same.
+
+<p class="tip">Do NOT do `import Vue from 'vue/dist/vue.common.js'` - since some tools or 3rd party libraries may import vue as well, this may cause the app to load both the runtime and standalone builds at the same time and lead to errors.</p>

src/guide/single-file-components.md

@@ -6,7 +6,7 @@ order: 21
 
 ## Official Flux-Like Implementation
 
-Large applications can often grow in complexity, due to multiple pieces of state scattered across many components and the interactions between them. To solve this problem, Vue offers [vuex](https://github.com/vuejs/vuex/tree/next): our own Elm-inspired state management library. It even integrates into [vue-devtools](https://github.com/vuejs/vue-devtools), providing zero-setup access to time travel.
+Large applications can often grow in complexity, due to multiple pieces of state scattered across many components and the interactions between them. To solve this problem, Vue offers [vuex](https://github.com/vuejs/vuex): our own Elm-inspired state management library. It even integrates into [vue-devtools](https://github.com/vuejs/vue-devtools), providing zero-setup access to time travel.
 
 ### Information for React Developers
 
@@ -75,4 +75,4 @@ var vmB = new Vue({
 
 As we continue developing the convention where components are never allowed to directly mutate state that belongs to a store, but should instead dispatch events that notify the store to perform actions, we eventually arrive at the [Flux](https://facebook.github.io/flux/) architecture. The benefit of this convention is we can record all state mutations happening to the store and implement advanced debugging helpers such as mutation logs, snapshots, and history re-rolls / time travel.
 
-This brings us full circle back to [vuex](https://github.com/vuejs/vuex/tree/next), so if you've read this far it's probably time to try it out!
+This brings us full circle back to [vuex](https://github.com/vuejs/vuex), so if you've read this far it's probably time to try it out!

src/guide/state-management.md

@@ -36,6 +36,8 @@
     <img src="/images/monterail.png">
   </a><a href="https://www.trisoft.ro/" target="_blank">
     <img src="/images/trisoft.png">
+  </a><a href="http://actualize.co" target="_blank" style="width:180px">
+    <img src="/images/actualize.png" style="width:180px">
   </a>
 </p>
 

src/support-vuejs/index.md

@@ -1,3 +1,4 @@
 google_analytics: UA-46852172-1
 root_domain: vuefe.cn
 vue_version: 2.0.0-rc.7
+vue_version: 2.0.0-rc.8

themes/vue/_config.yml

@@ -1,3 +1,9 @@
+<div class="sidebar">
+  <ul class="main-menu">
+    <%- partial('partials/main_menu', { context: 'sidebar' }) %>
+  </ul>
+</div>
+
 <div id="hero">
   <div class="inner">
     <ul id="nav">
@@ -37,9 +43,19 @@
       <li class="delimiter">|</li>
       <li><a href="http://it.vuejs.org" class="nav-link">Italiano</a></li>
     </ul>
+    <div class="left">
+      <img class="hero-logo" src="/images/logo.png">
+    </div><div class="right">
+      <h2 class="vue">Vue.js</h2>
+      <h1>
+        The Progressive<br>JavaScript Framework
+      </h1>
+      <p>
+        <a class="button" href="/guide/">GET STARTED</a>
+        <a class="button white" href="https://github.com/vuejs/vue" target="_blank">GITHUB</a>
+      </p>
+    </div>
   </div>
-
-  <div class="down"><img src="/images/down.png"></div>
 </div>
 
 <div id="sponsors-mobile">
@@ -77,22 +93,26 @@
 })
 </pre></td></tr></tbody></table></figure>
   </div>
+<div id="highlights">
+  <div class="inner">
+    <div class="point">
+      <h2>Performant</h2>
+      <p>
+        16kb min+gzip Runtime<br>
+        Blazing Fast Virtual DOM<br>
+        Minimal Optimization Efforts
+      </p>
+    </div>
 
-  <div class="sign">=</div>
+    <div class="point">
+      <h2>Versatile</h2>
+      <p>Lean, minimal core with a feature-rich, incrementally adoptable ecosystem.</p>
+    </div>
 
-  <div class="block result">
-    <div id="demo">
-      <p>{{message}}</p>
-      <input v-model="message">
+    <div class="point">
+      <h2>Approachable</h2>
+      <p>Already know HTML, CSS and JavaScript? Read the guide and start building things in no time!</p>
     </div>
-    <script>
-    var demo = new Vue({
-      el: '#demo',
-      data: {
-        message: 'Hello Vue.js!'
-      }
-    })
-    </script>
   </div>
 </div>
 <div id="features">
@@ -139,3 +159,22 @@
   <p>Copyright (c) <%- date(Date.now(), 'YYYY') %> <a href="http://evanyou.me" target="_blank">Evan You</a></p>
 </div>
 
+=======
+
+<div id="sponsors">
+  <div class="inner">
+    <h3>PROUDLY SPONSORED BY</h3>
+    <%- partial('partials/sponsors') %>
+    <br>
+    <a class="become-sponsor button white" href="/support-vuejs/">Become a Backer</a>
+  </div>
+</div>
+
+<div id="footer">
+  Released under the <a href="https://opensource.org/licenses/MIT" href="_blank">MIT License</a><br>
+  Copyright &copy; 2014-<%- new Date().getFullYear() %> Evan You
+</div>
+
+<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
+<script src="/js/common.js"></script>
+>>>>>>> 9d5c0295ecf3f0c913b9d198f3f9b653f02ae8ab

themes/vue/layout/index.ejs

@@ -19,8 +19,8 @@
             <a class="menu-button"></a>
             <a class="logo" href="/"></a>
         </div>
+        <%- partial('partials/header') %>
         <% if (!isIndex) { %>
-            <%- partial('partials/header') %>
             <div id="main">
                 <% if (page.blog_index) { %>
                     <%- partial('partials/blog') %>

themes/vue/layout/layout.ejs

@@ -1,5 +1,11 @@
 <% if (page.type) { %>
     <%- partial('partials/sidebar', { type: page.type, index: page.index }) %>
+<% } else { %>
+  <div class="sidebar">
+    <ul class="main-menu">
+      <%- partial('partials/main_menu', { context: 'sidebar' }) %>
+    </ul>
+  </div>
 <% } %>
 <div class="content <%- page.type ? page.type + ' with-sidebar' : '' %> <%- page.type === 'guide' ? page.path.replace(/.+\//, '').replace('.html', '') + '-guide' : '' %>">
     <%- partial('partials/ad') %>

themes/vue/layout/page.ejs

@@ -1,7 +1,7 @@
 <div id="header">
   <a id="logo" href="/">
     <img src="/images/logo.png">
-    <span>Vue.js <sup>2.0 RC</sup></span>
+    <span>Vue.js</span>
   </a>
   <span style="
     position: absolute;