Merge branch 'gh-pages'

Conflicts: _includes/disqus.html
Ryccoo · Jan 23, 2017 · 92ef8b7 · 92ef8b7
2 parents 2e573bd + 89d1622
commit 92ef8b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/_includes/disqus.html b/_includes/disqus.html
@@ -2,6 +2,10 @@
     <div id="disqus_thread"></div>
     <script type="text/javascript">
 
+        var disqus_config = function () {
+            this.page.url = '{{ site.url }}{{ page.url | replace:"index.html","" }}';
+            this.page.identifier = '{{ page.id }}';
+        };
         var disqus_shortname = '{{ site.disqus.shortname }}';
         var disqus_developer = 0;
         (function() {

diff --git a/_includes/nav.html b/_includes/nav.html
@@ -32,7 +32,7 @@
 
         {% if site.resume == true %}
             <li class="item">
-                <a class="link" href="{% if site.resume-external %}{{ site.resume-url }}{% else %}{{ site.url }}/{{ site.resume-url }}{% endif %}">Resume</a>
+                <a class="link" href="{% if site.resume-external %}{{ site.resume-url }}{% else %}{{ site.url }}/{{ site.resume-url }}{% endif %}">Résumé</a>
             </li>
         {% endif %}
     </ul>