Merge remote-tracking branch 'mmistakes/master' into upgrade_version

* mmistakes/master: (102 commits)
  Improve readability of .scss files
  Change `spin` to `adjust-hue` - Close mmistakes#201
  Update modified date
  Update gems
  removing parentheses, see issue mmistakes#141
  Fix search.js interferace with other forms - cc/ issue mmistakes#194
  Remove Octopress configuration
  Update README
  Remove feed.xml and replace with jekyll-feed gem
  Replace {% highlight %} Jekyll tags with GFM ```
  Remove Octopress dependency
  Update gems
  removed pro tip on applying for twitter cards
  Ignore .less files not files containing "less"
  Sanitize excerpts in search.json - Fixes mmistakes#191
  Normalize auto {{ post.excerpts }} - When excerpt: isn't set in a
post's YAML Front Matter fallback to Jekyll's auto excerpts - Strip
HTML from auto excerpts and MathJax code with Liquid filters applied to
post listings (index.html, /blog/, /articles/)
  Support Jekyll 3.0 - Update to Jekyll v3.0 - Switch from Pygments.rb
to Rouge for syntax highlighting - Include jekyll-gist gem - Update
theme documentation
  Fix typo in `bundle exec`
  Update dependencies
  Update links - Remove Made Mistakes from header nav - Update So
Simple footer link
  ...

# Conflicts:
#	_config.yml
#	_data/authors.yml
#	_data/navigation.yml
#	_includes/footer.html
#	_layouts/page.html
#	_layouts/post.html
#	_posts/articles/2011-03-10-sample-post.md
#	_posts/articles/2012-05-22-readability-post.md
#	_posts/articles/2013-05-22-sample-post-images.md
#	_posts/articles/2013-05-23-readability-feature-post.md
#	_posts/articles/2013-06-25-video-post.md
#	_posts/articles/2013-08-16-code-highlighting-post.md
#	_posts/articles/2014-06-19-author-override.md
#	_posts/blog/2014-08-08-hello-world.md
#	about/index.md
#	feed.xml
#	images/michael-rose-photo.jpg
#	images/so-simple-sample-image-1.jpg
#	images/so-simple-sample-image-2.jpg
#	images/so-simple-sample-image-3.jpg
#	images/so-simple-sample-image-4.jpg
#	images/so-simple-sample-image-5.jpg
#	images/so-simple-sample-image-6.jpg
#	images/so-simple-sample-image-7.jpg
#	theme-setup/index.md

.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -4,5 +4,5 @@ _site
 *.sublime-workspace
 codekit-config.json
 node_modules
-Gemfile.lock
-.sass-cache
+.sass-cache
+.jekyll-metadata

404.md

@@ -3,6 +3,8 @@ layout: page
 title: "Page Not Found"
 description: "Page not found. Your pixels are in another canvas."
 sitemap: false
+search_omit: true
+permalink: /404.html
 ---  
 
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
@@ -12,5 +14,5 @@ Sorry, but the page you were trying to view does not exist --- perhaps you can t
   var GOOG_FIXURL_SITE = '{{ site.url }}'
 </script>
 <script type="text/javascript"
-  src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
+  src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
 </script>

Gemfile

@@ -1,9 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'jekyll'
-gem 'jekyll-sitemap'
-gem 'octopress', '~> 3.0.0.rc.12'
-
-group :test do
-  gem 'html-proofer'
-end
+gem "jekyll"
+gem "jekyll-sitemap"
+gem "jekyll-gist"
+gem "jekyll-feed"

Gemfile.lock

@@ -0,0 +1,62 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    colorator (1.1.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    ffi (1.9.14-x64-mingw32)
+    forwardable-extended (2.6.0)
+    jekyll (3.2.1)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-feed (0.7.0)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-sitemap (0.11.0)
+      addressable (~> 2.4.0)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    multipart-post (2.0.0)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  jekyll
+  jekyll-feed
+  jekyll-gist
+  jekyll-sitemap
+
+BUNDLED WITH
+   1.12.5

README.md

@@ -2,16 +2,15 @@
 
 Looking for a simple, responsive, theme for your Jekyll powered blog? Well look no further. Here be **So Simple Theme**, the followup to [**Minimal Mistakes**](http://mmistakes.github.io/minimal-mistakes/) -- by designer slash illustrator [Michael Rose](http://mademistakes.com).
 
-[![Build Status](https://travis-ci.org/mmistakes/so-simple-theme.svg?branch=master)](https://travis-ci.org/mmistakes/so-simple-theme)
+## Notable features:
 
-## So Simple Theme is all about:
-
-* Responsive templates. Looking good on mobile, tablet, and desktop.
+* Compatible with Jekyll 3 and GitHub Pages.
+* Responsive templates. Looks good on mobile, tablet, and desktop devices.
 * Gracefully degrading in older browsers. Compatible with Internet Explorer 9+ and all modern browsers.
 * Minimal embellishments and subtle animations.
 * Optional large feature images for posts and pages.
 * [Custom 404 page](http://mmistakes.github.io/so-simple-theme/404.html) to get you started.
-* [Simple site search](https://github.com/christian-fei/Simple-Jekyll-Search)
+* Basic [search capabilities](https://github.com/mathaywarduk/jekyll-search)
 * Support for Disqus Comments
 
 ![screenshot of So Simple Theme](http://mmistakes.github.io/so-simple-theme/images/so-simple-theme-preview.jpg)
@@ -22,9 +21,8 @@ See a [live version of So Simple](http://mmistakes.github.io/so-simple-theme/) h
 
 ## Getting Started
 
-So Simple takes advantage of Sass and data files to make customizing easier. These features require Jekyll 2.x and will not work with older versions of Jekyll.
+So Simple takes advantage of Sass and data files to make customizing easier and requires Jekyll 3.x.
 
 To learn how to install and use this theme check out the [Setup Guide](http://mmistakes.github.io/so-simple-theme/theme-setup/) for more information.
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mmistakes/so-simple-theme/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

_config.yml

@@ -2,47 +2,49 @@
 
 title: Jesse Stuart
 locale: en_US
-description: 
+description:
 logo: site-logo.png
 search: false
-url: 
-
+url:
 
 # Jekyll configuration
 
 permalink:   /:categories/:title/
 markdown:    kramdown
-highlighter: pygments
+highlighter: rouge
 sass:
   sass_dir: _sass
   style: compressed
 gems:
   - jekyll-sitemap
+  - jekyll-gist
+  - jekyll-feed
 
 kramdown:
+  input: GFM
   auto_ids: true
   footnote_nr: 1
   entity_output: as_char
-  toc_levels: 1..6
-  use_coderay: false
+  toc_levels: 1..2
+  enable_coderay: false
 
-include: [".htaccess"]
-exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "vendor"]
+mathjax: true
 
+include: [".htaccess"]
+exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", ".less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "vendor"]
 
 # Site owner
 owner:
   name: Jesse Stuart
   avatar: bio-photo.jpg
   email: [email protected]
-  # twitter: jesse_stuart
-  # facebook: jesse.d.stuart
   github: jessestuart
   linkedin: jessedstuart
-  # instagram: jaystu
+  twitter: jesse_stuart
+  instagram: jaystu
   google:
     analytics: UA-53770919-1
     # verify: UQj93ERU9zgECodaaXgVpkjrFn9UrDMEzVamacSoQ8Y
     # ad-client: ca-pub-7328585512091257
     # ad-slot: 7855747535
-  # bing-verify: D81F4C18A6CB3018F64D7C827D953DFD
+  disqus-shortname:

_data/authors.yml

@@ -1,20 +1,11 @@
 # Authors
 
-# billy_rick:
-#   name: Billy Rick
-#   web: http://thewhip.com
-#   email: [email protected]
-#   bio: "What do you want, jewels? I am a very extravagant man."
-#   avatar: bio-photo-2.jpg
-#   twitter: extravagantman
-#   google:
-#     plus: BillyRick
-#
-# cornelius_fiddlebone:
-#   name: Cornelius Fiddlebone
-#   email: [email protected]
-#   bio: "I ordered what?"
-#   avatar: bio-photo.jpg
-#   twitter: rhymeswithsackit
-#   google:
-#     plus: CorneliusFiddlebone
+jesse:
+  name: Jesse Stuart
+  web: http://jessesturat.com
+  email: [email protected]
+  bio: ""
+  avatar: bio-photo-2.jpg
+  twitter: extravagantman
+  google:
+    plus: BillyRick

_data/navigation.yml

@@ -4,10 +4,10 @@
 
 - title: About
   url: /about/
-  
+
 - title: Publications
   url: /publications
-  
+
 - title: Resume
   url: /images/jesse_stuart-resume(8.13.14).pdf
 
@@ -21,4 +21,4 @@
 #   url: /theme-setup/
 #
 # - title: Made Mistakes
-#   url: http://mademistakes.com
+#   url: http://mademistakes.com

_includes/ad-footer.html

@@ -1,5 +1,5 @@
 <div class="google-ads" style="margin:10px 0;">
-  <script async src="http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
   <!-- 320x50 ad -->
   <ins class="adsbygoogle"
        style="display:inline-block;width:320px;height:50px"

_includes/ad-sidebar.html

@@ -1,5 +1,5 @@
 <div class="google-ads" style="margin-top:40px; text-align:center;">
-  <script async src="http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
   <!-- 160x600 ad -->
   <ins class="adsbygoogle"
        style="display:inline-block;width:160px;height:600px"

_includes/disqus_comments.html → _includes/disqus-comments.html

@@ -6,18 +6,18 @@
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
     })();
 
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="https://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
 {% endif %}

_includes/feed-footer.html

@@ -0,0 +1 @@
+<p><a href="{{ site.url }}{{ post.url }}">{{ post.title | xml_escape }}</a> was originally published by {{ site.owner.name }} at <a href="{{ site.url }}">{{ site.title }}</a> on {{ post.date | date: "%B %d, %Y" }}.</p>

_includes/footer.html

@@ -7,9 +7,11 @@
 	{% if site.owner.google.plus %}<a href="http://plus.google.com/+{{ site.owner.google.plus }}" title="{{ site.owner.name}} on Google+" target="_blank"><i class="fa fa-google-plus-square fa-2x"></i></a>{% endif %}
 	{% if site.owner.linkedin %}<a href="http://linkedin.com/in/{{ site.owner.linkedin }}" title="{{ site.owner.name}} on LinkedIn" target="_blank"><i class="fa fa-linkedin-square fa-2x"></i></a>{% endif %}
 	{% if site.owner.stackexchange %}<a href="{{ site.owner.stackexchange }}" title="{{ site.owner.name}} on StackExchange" target="_blank"><i class="fa fa-stack-exchange fa-2x"></i></a>{% endif %}
-	{% if site.owner.instagram %}<a href="http://instagram.com/{{ site.owner.instagram }}" title="{{ site.owner.name}} on Instagram" target="_blank"><i class="fa fa-instagram fa-2x"></i></a>{% endif %}
-	{% if site.owner.flickr %}<a href="http://www.flickr.com/photos/{{ site.owner.flickr }}" title="{{ site.owner.name}} on Flickr" target="_blank"><i class="fa fa-flickr fa-2x"></i></a>{% endif %}
-	{% if site.owner.github %}<a href="http://github.com/{{ site.owner.github }}" title="{{ site.owner.name}} on Github" target="_blank"><i class="fa fa-github-square fa-2x"></i></a>{% endif %}
+	{% if site.owner.instagram %}<a href="https://instagram.com/{{ site.owner.instagram }}" title="{{ site.owner.name}} on Instagram" target="_blank"><i class="fa fa-instagram fa-2x"></i></a>{% endif %}
+	{% if site.owner.flickr %}<a href="https://www.flickr.com/photos/{{ site.owner.flickr }}" title="{{ site.owner.name}} on Flickr" target="_blank"><i class="fa fa-flickr fa-2x"></i></a>{% endif %}
+	{% if site.owner.github %}<a href="https://github.com/{{ site.owner.github }}" title="{{ site.owner.name}} on Github" target="_blank"><i class="fa fa-github-square fa-2x"></i></a>{% endif %}
 	{% if site.owner.tumblr %}<a href="http://{{ site.owner.tumblr }}.tumblr.com" title="{{ site.owner.name}} on Tumblr" target="_blank"><i class="fa fa-tumblr-square fa-2x"></i></a>{% endif %}
+  {% if site.owner.pinterest %}<a href="https://www.pinterest.com/{{ site.owner.pinterest }}/" title="{{ site.owner.name}} on Pinterest" target="_blank"><i class="fa fa-pinterest fa-2x"></i></a>{% endif %}
+	{% if site.owner.weibo %}<a href="https://www.weibo.com/u/{{ site.owner.weibo }}/" title="{{ site.owner.name}} on Weibo" target="_blank"><i class="fa fa-weibo fa-2x"></i></a>{% endif %}
   <a href="{{ site.url }}/feed.xml" title="Atom/RSS feed"><i class="fa fa-rss-square fa-2x"></i></a>
-</div><!-- /.social-icons -->
+</div><!-- /.social-icons -->

_includes/head.html

@@ -15,17 +15,16 @@
 {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <link rel="canonical" href="{{ canonical }}">
 <link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
-{% if site.owner.google.plus %}<link rel="author" href="http://plus.google.com/+{{ site.owner.google.plus }}?rel=author">{% endif %}
 
-<!-- http://t.co/dKP3o1e -->
+<!-- https://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">
 <meta name="MobileOptimized" content="320">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <!-- For all browsers -->
 <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
 <!-- Webfonts -->
-<script src="//use.edgefonts.net/source-sans-pro:n2,i2,n3,i3,n4,i4,n6,i6,n7,i7,n9,i9;source-code-pro:n4,n7;volkhov.js"></script>
+<script src="https://use.edgefonts.net/source-sans-pro:n2,i2,n3,i3,n4,i4,n6,i6,n7,i7,n9,i9;source-code-pro:n4,n7;volkhov.js"></script>
 
 <meta http-equiv="cleartype" content="on">
 
@@ -38,6 +37,11 @@
 <!-- Modernizr -->
 <script src="{{ site.url }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
 
+{% if site.mathjax == true %}
+<!-- MathJax -->
+<script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+{% endif %}
+
 <!-- Icons -->
 <!-- 16x16 -->
 <link rel="shortcut icon" href="{{ site.url }}/favicon.ico">