From 171ebab3d7a3cd92690b3a0bb1835f25b8b2aa7c Mon Sep 17 00:00:00 2001
From: Felipe Morais <fmorais@thoughtworks.com>
Date: Tue, 12 Jun 2018 01:42:29 -0300
Subject: [PATCH 1/3] fix conflict in _config.yml

---
 _config.yml                      | 1 +
 _includes/icon-links.html        | 7 +++++++
 _includes/icons/icon-medium.html | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 _includes/icons/icon-medium.html

diff --git a/_config.yml b/_config.yml
index f66723c..f74cc24 100644
--- a/_config.yml
+++ b/_config.yml
@@ -44,6 +44,7 @@ resume_social_links:
   resume_linkedin_url:          "https://www.linkedin.com/in/joelglovier"
   # resume_instagram_url:         "insert your Instagram URL here"
   resume_website_url:           "http://joelglovier.com"
+  resume_medium_url:            "https://medium.com/@jglovier"
 resume_print_social_links:      true
 
 # Design settings
diff --git a/_includes/icon-links.html b/_includes/icon-links.html
index 2a151c7..6c65af1 100644
--- a/_includes/icon-links.html
+++ b/_includes/icon-links.html
@@ -7,6 +7,13 @@
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_github_url }}" class="icon-link" itemprop="url">{% include icons/icon-github.html %}</a></li>
   {% endif %}
 
+<!-- Medium link -->
+{% if site.resume_social_links.resume_medium_url %}
+<li class="icon-link-item">
+  <a href="{{ site.resume_social_links.resume_medium_url }}" class="icon-link" itemprop="url">{% include icons/icon-medium.html %}</a>
+</li>
+{% endif %}
+
   <!-- Twitter link -->
   {% if site.resume_social_links.resume_twitter_url %}
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_twitter_url }}" class="icon-link" itemprop="url">{% include icons/icon-twitter.html %}</a></li>
diff --git a/_includes/icons/icon-medium.html b/_includes/icons/icon-medium.html
new file mode 100644
index 0000000..531442c
--- /dev/null
+++ b/_includes/icons/icon-medium.html
@@ -0,0 +1,5 @@
+<svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 28 28"
+    enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+    <path id="Medium" fill="#D1CECC" d="M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm0 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm-2.426 14.741h-3.574v-.202l1.261-1.529c.134-.139.195-.335.162-.526v-5.304c.015-.147-.041-.293-.151-.392l-1.121-1.35v-.201h3.479l2.689 5.897 2.364-5.897h3.317v.201l-.958.919c-.083.063-.124.166-.106.269v6.748c-.018.103.023.206.106.269l.936.919v.201h-4.706v-.201l.969-.941c.095-.095.095-.123.095-.269v-5.455l-2.695 6.844h-.364l-3.137-6.844v4.587c-.026.193.038.387.174.526l1.26 1.529v.202z"
+    />
+</svg>

From 4b743d7286a9a7f9cf281b83acfc3502ba3feca5 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@gmail.com>
Date: Thu, 14 Jun 2018 17:04:56 -0400
Subject: [PATCH 2/3] Update icon-medium.html

---
 _includes/icons/icon-medium.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/_includes/icons/icon-medium.html b/_includes/icons/icon-medium.html
index 531442c..44108d7 100644
--- a/_includes/icons/icon-medium.html
+++ b/_includes/icons/icon-medium.html
@@ -1,5 +1,6 @@
-<svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 28 28"
-    enable-background="new 0 0 28 28" xml:space="preserve" width="28">
-    <path id="Medium" fill="#D1CECC" d="M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm0 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm-2.426 14.741h-3.574v-.202l1.261-1.529c.134-.139.195-.335.162-.526v-5.304c.015-.147-.041-.293-.151-.392l-1.121-1.35v-.201h3.479l2.689 5.897 2.364-5.897h3.317v.201l-.958.919c-.083.063-.124.166-.106.269v6.748c-.018.103.023.206.106.269l.936.919v.201h-4.706v-.201l.969-.941c.095-.095.095-.123.095-.269v-5.455l-2.695 6.844h-.364l-3.137-6.844v4.587c-.026.193.038.387.174.526l1.26 1.529v.202z"
-    />
+<svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+	<path id="Medium" fill="#D1CECC" d="M14,0C6.3,0,0,6.3,0,14s6.3,14,14,14s14-6.3,14-14S21.7,0,14,0z M11.2,19.5H7v-0.2l1.5-1.8
+	c0.2-0.2,0.2-0.4,0.2-0.6v-6.2c0-0.2,0-0.3-0.2-0.5L7.2,8.7V8.4h4.1l3.1,6.9l2.8-6.9H21v0.2l-1.1,1.1c-0.1,0.1-0.1,0.2-0.1,0.3v7.9
+	c0,0.1,0,0.2,0.1,0.3l1.1,1.1v0.2h-5.5v-0.2l1.1-1.1c0.1-0.1,0.1-0.1,0.1-0.3v-6.4l-3.1,8h-0.4l-3.7-8v5.4c0,0.2,0,0.5,0.2,0.6
+	l1.5,1.8C11.2,19.3,11.2,19.5,11.2,19.5z"/>
 </svg>

From 0d2a547c04dedbc404fbf5d01ea5f1bd2aa5c71b Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@gmail.com>
Date: Thu, 14 Jun 2018 17:05:43 -0400
Subject: [PATCH 3/3] reorder icon

---
 _includes/icon-links.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/_includes/icon-links.html b/_includes/icon-links.html
index 6c65af1..cc33ee3 100644
--- a/_includes/icon-links.html
+++ b/_includes/icon-links.html
@@ -7,17 +7,17 @@
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_github_url }}" class="icon-link" itemprop="url">{% include icons/icon-github.html %}</a></li>
   {% endif %}
 
-<!-- Medium link -->
-{% if site.resume_social_links.resume_medium_url %}
-<li class="icon-link-item">
-  <a href="{{ site.resume_social_links.resume_medium_url }}" class="icon-link" itemprop="url">{% include icons/icon-medium.html %}</a>
-</li>
-{% endif %}
-
   <!-- Twitter link -->
   {% if site.resume_social_links.resume_twitter_url %}
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_twitter_url }}" class="icon-link" itemprop="url">{% include icons/icon-twitter.html %}</a></li>
   {% endif %}
+  
+  <!-- Medium link -->
+  {% if site.resume_social_links.resume_medium_url %}
+  <li class="icon-link-item">
+    <a href="{{ site.resume_social_links.resume_medium_url }}" class="icon-link" itemprop="url">{% include icons/icon-medium.html %}</a>
+  </li>
+  {% endif %}
 
   <!-- Dribbble link -->
   {% if site.resume_social_links.resume_dribbble_url %}