Merge branch 'release/2.3.0'

mmistakes · Jun 1, 2016 · fdb0491 · fdb0491
2 parents 0209a9d + 1bdac88
commit fdb0491
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 216 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 3.0"
+gem "jekyll"
 gem "jekyll-sitemap"
 gem "jekyll-gist"
-gem "octopress"
+gem "jekyll-feed"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.4.0)
     colorator (0.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
-    jekyll (3.1.1)
+    ffi (1.9.10-x64-mingw32)
+    jekyll (3.1.6)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -15,56 +16,42 @@ GEM
       mercenary (~> 0.3.3)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
     jekyll-sitemap (0.10.0)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
-    kramdown (1.9.0)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.11.1)
     liquid (3.0.6)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mercenary (0.3.5)
+    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.2.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    octopress (3.0.11)
-      jekyll (>= 2.0)
-      mercenary (~> 0.3.2)
-      octopress-deploy
-      octopress-escape-code (~> 2.0)
-      octopress-hooks (~> 2.0)
-      redcarpet (~> 3.0)
-      titlecase
-    octopress-deploy (1.3.0)
-      colorator
-    octopress-escape-code (2.1.1)
-      jekyll (~> 3.0)
-    octopress-hooks (2.6.1)
-      jekyll (>= 2.0)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redcarpet (3.3.4)
     rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.21)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    titlecase (0.1.1)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.0)
+  jekyll
+  jekyll-feed
   jekyll-gist
   jekyll-sitemap
-  octopress
 
 BUNDLED WITH
-   1.11.2
+   1.12.5
diff --git a/README.md b/README.md
@@ -21,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")
-
diff --git a/_config.yml b/_config.yml
@@ -18,8 +18,10 @@ sass:
 gems:
   - jekyll-sitemap
   - jekyll-gist
+  - jekyll-feed
 
 kramdown:
+  input: GFM
   auto_ids: true
   footnote_nr: 1
   entity_output: as_char

diff --git a/_posts/articles/2011-03-10-sample-post.md b/_posts/articles/2011-03-10-sample-post.md
@@ -2,7 +2,7 @@
 layout: post
 title: Sample Post
 excerpt: "Just about everything you'll need to style in the theme: headings, paragraphs, blockquotes, tables, code blocks, and more."
-modified: 2013-05-31
+modified: 2016-06-01T14:17:25-04:00
 categories: articles
 tags: [sample-post]
 image:
@@ -73,17 +73,17 @@ HTML and <abbr title="cascading stylesheets">CSS<abbr> are our tools. Mauris a a
 
 ## Code Snippets
 
-Syntax highlighting via Pygments and Rouge
+Syntax highlighting via Rouge
 
-{% highlight css %}
+```css
 #container {
   float: left;
   margin: 0 -240px 0 0;
   width: 100%;
 }
-{% endhighlight %}
+```
 
-Non Pygments/Rouge code example
+Non Rouge code example
 
     <div id="awesome">
         <p>This is great isn't it?</p>
@@ -93,4 +93,4 @@ Non Pygments/Rouge code example
 
 Make any link standout more when applying the `.btn` class.
 
-<div markdown="0"><a href="http://mademistakes.com" class="btn">This is a button</a></div>
+<div markdown="0"><a href="#" class="btn">This is a button</a></div>
diff --git a/_posts/articles/2013-05-22-sample-post-images.md b/_posts/articles/2013-05-22-sample-post-images.md
@@ -6,6 +6,7 @@ categories: articles
 tags: [sample-post, images, test]
 comments: true
 share: true
+modified: 2016-06-01T14:17:50-04:00
 ---
 
 Here are some examples of what a post with images might look like. If you want to display two or three images next to each other responsively use `figure` with the appropriate `class`. Each instance of `figure` is auto-numbered and displayed in the caption.
@@ -23,13 +24,13 @@ Here are some examples of what a post with images might look like. If you want t
 
 Apply the `half` class like so to display two images side by side that share the same caption.
 
-{% highlight html %}
+```html
 <figure class="half">
 	<img src="/images/image-filename-1.jpg" alt="image">
 	<img src="/images/image-filename-2.jpg" alt="image">
 	<figcaption>Caption describing these two images.</figcaption>
 </figure>
-{% endhighlight %}
+```
 
 And you'll get something that looks like this:
 
@@ -45,14 +46,14 @@ And you'll get something that looks like this:
 
 Apply the `third` class like so to display three images side by side that share the same caption.
 
-{% highlight html %}
+```html
 <figure class="third">
 	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt="image"></a>
 	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt="image"></a>
 	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt="image"></a>
 	<figcaption>Caption describing these three images.</figcaption>
 </figure>
-{% endhighlight %}
+```
 
 And you'll get something that looks like this:
 
@@ -64,4 +65,4 @@ And you'll get something that looks like this:
 	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt="image"></a>
 	<a href="http://placehold.it/1200x600.jpg"><img src="http://placehold.it/600x300.jpg" alt="image"></a>
 	<figcaption>Three images.</figcaption>
-</figure>
+</figure>
diff --git a/_posts/articles/2013-06-25-video-post.md b/_posts/articles/2013-06-25-video-post.md
@@ -6,18 +6,17 @@ categories: articles
 tags: [sample-post, video]
 comments: true
 share: true
+modified: 2016-06-01T14:18:26-04:00
 ---
 
 <iframe width="560" height="315" src="//www.youtube.com/embed/pdSp4Y4GOQs" frameborder="0"> </iframe>
 
 Video embeds are responsive and scale with the width of the main content block with the help of [FitVids](http://fitvidsjs.com/).
 
-Not sure if this only effects Kramdown or if it's an issue with Markdown in general. But adding YouTube video embeds causes errors when building your Jekyll site. To fix add a space between the `<iframe>` tags and remove `allowfullscreen`. Example below:
-
-{% highlight html %}
+```html
 <iframe width="560" height="315" src="http://www.youtube.com/embed/PWf4WUoMXwg" frameborder="0"> </iframe>
-{% endhighlight %}
+```
 
 And here's a Vimeo embed for testing purposes.
 
-<iframe src="//player.vimeo.com/video/98146708?title=0&amp;byline=0" width="500" height="281" frameborder="0"> </iframe>
+<iframe src="//player.vimeo.com/video/98146708?title=0&amp;byline=0" width="500" height="281" frameborder="0"> </iframe>
diff --git a/_posts/articles/2013-08-16-code-highlighting-post.md b/_posts/articles/2013-08-16-code-highlighting-post.md
@@ -10,6 +10,7 @@ image:
   creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
 comments: true
 share: true
+modified: 2016-06-01T14:11:53-04:00
 ---
 
 Syntax highlighting is a feature that displays source code, in different colors and fonts according to the category of terms. This feature facilitates writing in a structured language such as a programming language or a markup language as both structures and syntax errors are visually distinct. Highlighting does not affect the meaning of the text itself; it is intended only for human readers.[^1]
@@ -20,15 +21,15 @@ Syntax highlighting is a feature that displays source code, in different colors
 
 To modify styling and highlight colors edit `/_sass/_syntax.scss`.
 
-{% highlight css %}
+```css
 #container {
   float: left;
   margin: 0 -240px 0 0;
   width: 100%;
 }
-{% endhighlight %}
+```
 
-{% highlight html %}
+```html
 {% raw %}
 <nav class="pagination" role="navigation">
     {% if page.previous %}
@@ -39,9 +40,9 @@ To modify styling and highlight colors edit `/_sass/_syntax.scss`.
     {% endif %}
 </nav><!-- /.pagination -->
 {% endraw %}
-{% endhighlight %}
+```
 
-{% highlight ruby %}
+```ruby
 module Jekyll
   class TagIndex < Page
     def initialize(site, base, dir, tag)
@@ -59,8 +60,7 @@ module Jekyll
     end
   end
 end
-{% endhighlight %}
-
+```
 
 ### Standard Code Block
 

diff --git a/_posts/articles/2014-06-19-author-override.md b/_posts/articles/2014-06-19-author-override.md
@@ -7,6 +7,7 @@ tags: [sample-post, readability, test]
 author: billy_rick
 comments: true
 share: true
+modified: 2016-06-01T14:18:57-04:00
 image:
   feature: so-simple-sample-image-7.jpg
   credit: WeGraphics
@@ -19,7 +20,7 @@ Previously the theme used a global author for the entire site and those attribut
 
 Start by modifying or creating a new `authors.yml` file in the `_data` folder and add your authors using the following format.
 
-{% highlight yaml %}
+```yaml
 # Authors
 
 billy_rick:
@@ -40,10 +41,10 @@ cornelius_fiddlebone:
   twitter: rhymeswithsackit
   google:
     plus: CorneliusFiddlebone
-{% endhighlight %}
+```
 
 To assign Billy Rick as an author for our post. You'd add the following YAML front matter to a post:
 
-{% highlight yaml %}
+```yaml
 author: billy_rick
-{% endhighlight %}
+```
diff --git a/_posts/blog/2014-08-08-hello-world.md b/_posts/blog/2014-08-08-hello-world.md
@@ -8,6 +8,7 @@ tags: []
 image:
   feature:
 date: 2014-08-08T15:39:55-04:00
+modified: 2016-06-01T14:19:19-04:00
 ---
 
 You'll find this post in your `_posts` directory - edit this post and re-build (or run with the `-w` switch) to see your changes!
@@ -19,13 +20,13 @@ To add new posts, simply add a file in the `_posts` directory that follows the c
 
 Jekyll also offers powerful support for code snippets:
 
-{% highlight ruby %}
+```ruby
 def print_hi(name)
   puts "Hi, #{name}"
 end
 print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
-{% endhighlight %}
+```
 
 Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].
 

diff --git a/_posts/blog/2015-08-10-mathjax-example.md b/_posts/blog/2015-08-10-mathjax-example.md
@@ -16,15 +16,15 @@ date: 2015-08-10T08:08:50-04:00
 
 To enable MathJax support be sure Kramdown is your Markdown flavor of choice and MathJax is set to true in your `_config.yml` file.
 
-~~~
+```yaml
 markdown: kramdown
 mathjax: true
-~~~
+```
 
-~~~
+```
 Here is an example MathJax inline rendering \\( 1/x^{2} \\), and here is a block rendering: 
 \\[ \frac{1}{n^{2}} \\]
-~~~
+```
 
 Here is an example MathJax inline rendering \\( 1/x^{2} \\), and here is a block rendering: 
 \\[ \frac{1}{n^{2}} \\]

diff --git a/_templates/archive b/_templates/archive
diff --git a/_templates/page b/_templates/page
diff --git a/_templates/post b/_templates/post