Merge pull request vuejs#187 from Alex-Sokolov/master

Новые правки

Author: gbezyuk

_config.yml

@@ -99,10 +99,11 @@ 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: networkFirst
       options:
@@ -111,6 +112,11 @@ offline:
       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

src/v2/guide/list.md

@@ -262,7 +262,7 @@ Vue.component('todo-item', {
   template: '\
     <li>\
       {{ title }}\
-      <button v-on:click="$emit('remove')">X</button>\
+      <button v-on:click="$emit(\'remove\')">X</button>\
     </li>\
   ',
   props: ['title']
@@ -309,7 +309,7 @@ Vue.component('todo-item', {
   template: '\
     <li>\
       {{ title }}\
-      <button v-on:click="$emit('remove')">X</button>\
+      <button v-on:click="$emit(\'remove\')">X</button>\
     </li>\
   ',
   props: ['title']

src/v2/guide/team.md

@@ -206,7 +206,8 @@ order: 31
     'Bangalore, India': [12.971599, 77.594563],
     'Kingston, Jamaica': [18.017874, -76.809904],
     'Tehran, Iran': [35.689197, 51.388974],
-    'Shanghai, China': [31.230390, 121.473702]
+    'Shanghai, China': [31.230390, 121.473702],
+    'Annecy, France': [45.899247, 6.129384]
   }
   var languageNameFor = {
     en: 'English',
@@ -612,6 +613,25 @@ order: 31
       reposPersonal: [
         'elemefe/element', 'elemefe/mint-ui'
       ]
+    },
+    {
+      name: 'Bruno Lesieur',
+      title: 'French Community Directeur',
+      city: 'Annecy, France',
+      languages: ['fr', 'en'],
+      github: 'Haeresis',
+      twitter: 'MachinisteWeb',
+      work: {
+        role: 'Cofounder',
+        org: 'Orchard ID',
+        orgUrl: 'https://www.orchard-id.com/'
+      },
+      reposPersonal: [
+        'vuejs-fr/vuejs.org', 'Haeresis/node-atlas-hello-vue'
+      ],
+      links: [
+        'https://node-atlas.js.org/', 'https://blog.lesieur.name/'
+      ]
     }
   ]
 

themes/vue/_config.yml

@@ -1,4 +1,4 @@
-site_description: "Vue.js — Интуитивный, быстрый и компонуемый MVVM для создания интерактивных интерфейсов."
+site_description: "Vue.js — Прогрессивный JavaScript-фреймворк"
 google_analytics: UA-46852172-1
 root_domain: ru.vuejs.org
 vue_version: 2.3.0

themes/vue/layout/index.ejs

@@ -1,7 +1,9 @@
 <div class="sidebar">
-  <ul class="main-menu">
-    <%- partial('partials/main_menu', { context: 'sidebar' }) %>
-  </ul>
+  <div class="sidebar-inner-index">
+    <ul class="main-menu">
+      <%- partial('partials/main_menu', { context: 'sidebar' }) %>
+    </ul>
+  </div>
 </div>
 
 <div id="hero">

themes/vue/layout/partials/ecosystem_dropdown.ejs

@@ -21,6 +21,7 @@
     <li><h4>Списки ресурсов</h4></li>
     <li><ul>
       <li><a href="https://github.com/vuejs" class="nav-link" target="_blank">Официальные репозитории</a></li>
+      <li><a href="https://curated.vuejs.org/" class="nav-link" target="_blank">Vue Curated</a></li>
       <li><a href="https://github.com/vuejs/awesome-vue" class="nav-link" target="_blank">Awesome Vue</a></li>
     </ul></li>
   </ul>