Merge branch 'gh-pages' into gh-pages

_config.yml

@@ -110,3 +110,5 @@ plugins:
 
 jekyll-mentions:
  base_url: https://github.com
+
+exclude: ["travis.sh", "Rakefile", "README.md", "Gemfile", "Gemfile.lock", "FAQ.md"]

_includes/analytics-google.html

@@ -1,11 +1,9 @@
-<!-- Google Analytics Tracking code -->
-<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '{{ site.analytics-google }}']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.analytics-google }}"></script>
+<script>
+ window.dataLayer = window.dataLayer || [];
+ function gtag(){dataLayer.push(arguments);}
+ gtag('js', new Date());
+
+ gtag('config', '{{ site.analytics-google }}');
 </script>

_includes/author.html

@@ -1,6 +1,6 @@
 <section class="author{% if site.disqus == false %} no-disqus{% endif %}">
  <div class="toleft">
- <img class="selfie" src="{% if site.authors[page.author].external-image == true %}{{ site.authors[page.author].picture }}{% else %}{{ site.url }}/{{ site.authors[page.author].picture }}{% endif %}" alt="{{ site.authors[page.author].name }}" alt="author selfie">
+ <img class="selfie" src="{% if site.authors[page.author].external-image == true %}{{ site.authors[page.author].picture }}{% else %}{{ site.url }}/{{ site.authors[page.author].picture }}{% endif %}" alt="{{ site.authors[page.author].name }}">
  </div>
 
  <div class="toright">

_layouts/default.html

@@ -15,6 +15,8 @@
 
  <meta name=description content="{{ site.bio }}">
  <meta name=author content="{{ site.name }}">
+ <meta property="og:image" content="{{ site.url }}/{{ site.picture }}">
+ <meta property="og:type" content="profile">
 
  {% seo %}
 

_posts/2015-02-24-markdown-extra-components.markdown

@@ -11,7 +11,6 @@ tag:
 category: blog
 author: jamesfoster
 description: Markdown summary with different options
-# jemoji: '<img class="emoji" title=":ramen:" alt=":ramen:" src="https://assets.github.com/images/icons/emoji/unicode/1f35c.png" height="20" width="20" align="absmiddle">'
 ---
 
 ## Summary: