From 4de31314c00df5f9bdf169f7e38b1350aaf6fd57 Mon Sep 17 00:00:00 2001
From: Tomas Corral <tomas@backbase.com>
Date: Tue, 11 Dec 2018 19:28:18 +0100
Subject: [PATCH 1/2] Add Vuejs Amsterdam

---
 src/v2/guide/team.md | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/v2/guide/team.md b/src/v2/guide/team.md
index 4681d72cf2..0d7f8c3388 100644
--- a/src/v2/guide/team.md
+++ b/src/v2/guide/team.md
@@ -197,6 +197,7 @@ order: 803
   var cityCoordsFor = {
     'Annecy, France': [45.899247, 6.129384],
     'Alicante, Spain' : [38.346543, -0.483838],
+    'Amsterdam, Netherlands': [4.895168, 52.370216],
     'Bangalore, India': [12.971599, 77.594563],
     'Beijing, China': [39.904200, 116.407396],
     'Bordeaux, France': [44.837789, -0.579180],
@@ -707,6 +708,54 @@ order: 803
   ]))
 
   var partners = [
+    {
+      name: 'Luke Thomas',
+      title: 'Creator of Vuejs Amsterdam',
+      city: 'Amsterdam, NL',
+      languages: ['nl', 'en', 'de'],
+      work: {
+        role: 'Creator',
+        org: 'Vuejs Amsterdam'
+      },
+      github: '',
+      twitter: '',
+      links: [
+        'https://vuejs.amsterdam',
+        'https://www.linkedin.com/in/luke-kenneth-thomas-578b3916a/?originalSubdomain=nl'
+      ]
+    },
+    {
+      name: 'Jos Gerards',
+      title: 'Organiser and Host of Vuejs Amsterdam & Frontend Love',
+      city: 'Amsterdam, NL',
+      languages: ['nl', 'en', 'de'],
+      work: {
+        role: 'Event Manager',
+        org: 'Vuejs Amsterdam'
+      },
+      github: '',
+      twitter: 'josgerards88',
+      links: [
+        'https://vuejs.amsterdam',
+        'https://www.linkedin.com/in/josgerards/'
+      ]
+    },
+    {
+      name: 'James McGlasson',
+      title: 'Head of Marketing Communications',
+      city: 'Amsterdam, NL',
+      languages: ['en', 'nl', 'de']
+      work: {
+        role: 'Head Of Marketing Communications',
+        org: 'Vuejs Amsterdam'
+      },
+      github: '',
+      twitter: '',
+      links: [
+        'https://vuejs.amsterdam',
+        'https://www.linkedin.com/in/jdog/'
+      ]
+    },
     {
       name: 'Jen Looper',
       title: 'Queen Fox',

From 2b4281dbb56eec0fde311697dee36ef0036e813d Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Wed, 19 Dec 2018 13:48:26 -0500
Subject: [PATCH 2/2] fix profiles for vue.js amsterdam organizers

---
 package.json                     |  4 +--
 src/v2/guide/team.md             | 56 ++++++++++++++++++--------------
 themes/vue/source/css/_team.styl |  2 ++
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index cabf4cd6bf..4d698ffdb6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "vuejs.org",
   "private": true,
   "hexo": {
-    "version": "3.7.0"
+    "version": "3.8.0"
   },
   "scripts": {
     "start": "hexo server",
@@ -29,4 +29,4 @@
     "hoek": "^5.0.3",
     "request": "^2.85.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/v2/guide/team.md b/src/v2/guide/team.md
index 0d7f8c3388..00534e3759 100644
--- a/src/v2/guide/team.md
+++ b/src/v2/guide/team.md
@@ -8,9 +8,15 @@ order: 803
 <script id="vuer-profile-template" type="text/template">
   <div class="vuer">
     <div class="avatar">
-      <img v-if="profile.github"
+      <img v-if="profile.imageUrl"
+        :src="profile.imageUrl"
+        :alt="profile.name" width=80 height=80>
+      <img v-else-if="profile.github"
         :src="'https://github.com/' + profile.github + '.png'"
         :alt="profile.name" width=80 height=80>
+      <img v-else-if="profile.twitter"
+        :src="'https://avatars.io/twitter/' + profile.twitter"
+        :alt="profile.name" width=80 height=80>
     </div>
     <div class="profile">
       <h3 :data-official-title="profile.title">
@@ -103,6 +109,10 @@ order: 803
             <i class="fa fa-codepen"></i>
             <span class="sr-only">CodePen</span>
           </a>
+          <a class=linkedin v-if="profile.linkedin" :href="'https://www.linkedin.com/in/' + profile.linkedin">
+            <i class="fa fa-linkedin"></i>
+            <span class="sr-only">LinkedIn</span>
+          </a>
         </footer>
       </dl>
     </div>
@@ -145,7 +155,7 @@ order: 803
 
     <vuer-profile
       v-for="profile in sortedTeam"
-      :key="profile.github"
+      :key="profile.name"
       :profile="profile"
       :title-visible="titleVisible"
     ></vuer-profile>
@@ -185,7 +195,7 @@ order: 803
 
     <vuer-profile
       v-for="profile in sortedPartners"
-      :key="profile.github"
+      :key="profile.name"
       :profile="profile"
       :title-visible="titleVisible"
     ></vuer-profile>
@@ -235,6 +245,7 @@ order: 803
   }
   var languageNameFor = {
     en: 'English',
+    nl: 'Nederlands',
     zh: '中文',
     vi: 'Tiếng Việt',
     pl: 'Polski',
@@ -710,50 +721,47 @@ order: 803
   var partners = [
     {
       name: 'Luke Thomas',
-      title: 'Creator of Vuejs Amsterdam',
-      city: 'Amsterdam, NL',
+      title: 'Creator of Vue.js Amsterdam',
+      city: 'Amsterdam, Netherlands',
       languages: ['nl', 'en', 'de'],
       work: {
         role: 'Creator',
-        org: 'Vuejs Amsterdam'
+        org: 'Vue.js Amsterdam'
       },
-      github: '',
-      twitter: '',
+      twitter: 'lukevscostas',
+      linkedin: 'luke-kenneth-thomas-578b3916a',
       links: [
-        'https://vuejs.amsterdam',
-        'https://www.linkedin.com/in/luke-kenneth-thomas-578b3916a/?originalSubdomain=nl'
+        'https://vuejs.amsterdam'
       ]
     },
     {
       name: 'Jos Gerards',
-      title: 'Organiser and Host of Vuejs Amsterdam & Frontend Love',
-      city: 'Amsterdam, NL',
+      title: 'Organizer and Host of Vue.js Amsterdam & Frontend Love',
+      city: 'Amsterdam, Netherlands',
       languages: ['nl', 'en', 'de'],
       work: {
         role: 'Event Manager',
-        org: 'Vuejs Amsterdam'
+        org: 'Vue.js Amsterdam'
       },
-      github: '',
       twitter: 'josgerards88',
+      linkedin: 'josgerards',
       links: [
-        'https://vuejs.amsterdam',
-        'https://www.linkedin.com/in/josgerards/'
+        'https://vuejs.amsterdam'
       ]
     },
     {
       name: 'James McGlasson',
       title: 'Head of Marketing Communications',
-      city: 'Amsterdam, NL',
-      languages: ['en', 'nl', 'de']
+      imageUrl: 'https://media.licdn.com/dms/image/C4E03AQHxi_fy33l5Mg/profile-displayphoto-shrink_800_800/0?e=1550707200&v=beta&t=6kPVnuYMxbxR_oAz3rdAeuDB-S8Om8e5W3zwbcH0dQI',
+      city: 'Amsterdam, Netherlands',
+      languages: ['en', 'nl', 'de'],
       work: {
         role: 'Head Of Marketing Communications',
-        org: 'Vuejs Amsterdam'
+        org: 'Vue.js Amsterdam'
       },
-      github: '',
-      twitter: '',
+      linkedin: 'jdog',
       links: [
-        'https://vuejs.amsterdam',
-        'https://www.linkedin.com/in/jdog/'
+        'https://vuejs.amsterdam'
       ]
     },
     {
@@ -1109,7 +1117,7 @@ order: 803
         )
       },
       hasSocialLinks: function () {
-        return this.profile.github || this.profile.twitter || this.profile.codepen
+        return this.profile.github || this.profile.twitter || this.profile.codepen || this.profile.linkedin
       }
     },
     methods: {
diff --git a/themes/vue/source/css/_team.styl b/themes/vue/source/css/_team.styl
index 86fa934ca8..dccbafa60d 100644
--- a/themes/vue/source/css/_team.styl
+++ b/themes/vue/source/css/_team.styl
@@ -122,6 +122,8 @@
             color: #000
           &.twitter
             color: #1da1f3
+          &.linkedin
+            color: #0077B5
         i
           vertical-align: text-bottom
           font-size: 1.3em