Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	themes/vue/_config.yml
#	themes/vue/layout/partials/ecosystem_dropdown.ejs
#	themes/vue/layout/partials/sidebar.ejs
#	themes/vue/source/css/_common.styl
#	themes/vue/source/css/index.styl
#	themes/vue/source/css/page.styl

Author: MachinisteWeb

Diff for: _config.yml

@@ -99,18 +99,24 @@ markdown:
 offline:
   maximumFileSizeToCacheInBytes: 10485760
   staticFileGlobs:
-    - public/**/*.{js,html,css,png,jpg,gif,svg,eot,ttf,woff,json,xml}
+    - public/**/*.{js,html,css,png,jpg,jpeg,gif,svg,eot,ttf,woff,woff2,json,xml}
   stripPrefix: public
   verbose: true
   runtimeCaching:
+    # Ad Sources - should be networkFirst
     - urlPattern: /*
-      handler: cacheFirst
+      handler: networkFirst
       options:
         origin: sendgrid.sp1.convertro.com
     - urlPattern: /*
-      handler: cacheFirst
+      handler: networkFirst
       options:
         origin: ad.doubleclick.net
+    - urlPattern: /*
+      handler: networkFirst
+      options:
+        origin: srv.carbonads.net
+    # CDNs - should be cacheFirst, since they should be used specific versions so should not change
     - urlPattern: /*
       handler: cacheFirst
       options:
@@ -123,6 +129,14 @@ offline:
       handler: cacheFirst
       options:
         origin: fonts.gstatic.com
+    - urlPattern: /*
+      handler: cacheFirst
+      options:
+        origin: cdnjs.cloudflare.com
+    - urlPattern: /*
+      handler: cacheFirst
+      options:
+        origin: maxcdn.bootstrapcdn.com
 
 # Deployment
 ## Docs: http://zespia.tw/hexo/docs/deployment.html

Diff for: src/v2/guide/components.md

@@ -639,15 +639,15 @@ Voyons cela par l'exemple avec une simple saisie de devise :
 
 ``` js
 Vue.component('currency-input', {
-  template: `
-    <span>
-      $
-      <input
-        ref="input"
-        v-bind:value="value"
-        v-on:input="updateValue($event.target.value)">
-    </span>
-  `,
+  template: '\
+    <span>\
+      $\
+      <input\
+        ref="input"\
+        v-bind:value="value"\
+        v-on:input="updateValue($event.target.value)">\
+    </span>\
+  ',
   props: ['value'],
   methods: {
     // Au lieu de mettre à jour directement la valeur, cette

Diff for: src/v2/guide/installation.md

@@ -93,7 +93,7 @@ Si vous avez besoin de compiler des templates en temps réel (ex. : passer une c
 ``` js
 // ceci a besoin d'un compilateur
 new Vue({
-  template: `<div>{{ hi }}</div>`
+  template: '<div>{{ hi }}</div>'
 })
 
 // ceci n'en a pas besoin

Diff for: src/v2/guide/list.md

@@ -249,7 +249,7 @@ Voici un exemple complet d'une simple liste de tâches :
     <li
       is="todo-item"
       v-for="(todo, index) in todos"
-      v-bind:key="todo"
+      v-bind:key="index"
       v-bind:title="todo"
       v-on:remove="todos.splice(index, 1)"
     ></li>
@@ -259,12 +259,12 @@ Voici un exemple complet d'une simple liste de tâches :
 
 ``` js
 Vue.component('todo-item', {
-  template: `
-    <li>
-      {{ title }}
-      <button v-on:click="$emit('remove')">X</button>
-    </li>
-  `,
+  template: '\
+    <li>\
+      {{ title }}\
+      <button v-on:click="$emit('remove')">X</button>\
+    </li>\
+  ',
   props: ['title']
 })
 
@@ -298,20 +298,20 @@ new Vue({
     <li
       is="todo-item"
       v-for="(todo, index) in todos"
-      v-bind:key="todo"
+      v-bind:key="index"
       v-bind:title="todo"
       v-on:remove="todos.splice(index, 1)"
     ></li>
   </ul>
 </div>
 <script>
 Vue.component('todo-item', {
-  template: `
-    <li>
-      {{ title }}
-      <button v-on:click="$emit('remove')">X</button>
-    </li>
-  `,
+  template: '\
+    <li>\
+      {{ title }}\
+      <button v-on:click="$emit('remove')">X</button>\
+    </li>\
+  ',
   props: ['title']
 })
 new Vue({