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

.gitignore

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

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'jekyll', '2.5.3'
-gem 'jekyll-sitemap'
-gem 'rouge'
-gem 'octopress', '~> 3.0'
+gem "jekyll", "~> 3.0"
+gem "jekyll-sitemap"
+gem "jekyll-gist"
+gem "octopress"

Gemfile.lock

@@ -2,47 +2,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
     colorator (0.1)
-    execjs (2.6.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fast-stemmer (1.0.2)
     ffi (1.9.10)
-    ffi (1.9.10-x64-mingw32)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    jekyll (3.1.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
-    jekyll-sitemap (0.9.0)
+    jekyll-sitemap (0.10.0)
     jekyll-watch (1.3.1)
       listen (~> 3.0)
     kramdown (1.9.0)
-    liquid (2.6.3)
+    liquid (3.0.6)
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -60,16 +41,10 @@ GEM
       titlecase
     octopress-deploy (1.3.0)
       colorator
-    octopress-escape-code (2.0.6)
-      octopress-hooks (~> 2.0)
+    octopress-escape-code (2.1.1)
+      jekyll (~> 3.0)
     octopress-hooks (2.6.1)
       jekyll (>= 2.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -81,19 +56,15 @@ GEM
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     titlecase (0.1.1)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
-  jekyll (= 2.5.3)
+  jekyll (~> 3.0)
+  jekyll-gist
   jekyll-sitemap
-  octopress (~> 3.0)
-  rouge
+  octopress
 
 BUNDLED WITH
    1.11.2

README.md

@@ -2,11 +2,10 @@
 
 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).
 
-**Jekyll 3 Update:** A version of So Simple compatible with Jekyll 3 can be found in the [`jekyll3` branch](https://github.com/mmistakes/so-simple-theme/tree/jekyll3). GitHub Pages is [locked at version 2.4](https://pages.github.com/versions/) so some keep that in mind if you're trying to use 3.0 features that aren't supported there yet.
+## 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.

_config.yml

@@ -11,12 +11,13 @@ url: http://localhost:4000
 
 permalink:   /:categories/:title/
 markdown:    kramdown
-highlighter: pygments
+highlighter: rouge
 sass:
   sass_dir: _sass
   style: compressed
 gems:
   - jekyll-sitemap
+  - jekyll-gist
 
 kramdown:
   auto_ids: true

_posts/articles/2013-08-16-code-highlighting-post.md

@@ -16,7 +16,7 @@ Syntax highlighting is a feature that displays source code, in different colors
 
 [^1]: <http://en.wikipedia.org/wiki/Syntax_highlighting>
 
-### Pygments or Rouge Code Blocks
+### Highlighted Code Blocks
 
 To modify styling and highlight colors edit `/_sass/_syntax.scss`.
 
@@ -78,8 +78,6 @@ end
 
 ### Fenced Code Blocks
 
-To modify styling and highlight colors edit `/_sass/_coderay.scss`. Line numbers and a few other things can be modified in `_config.yml`. Consult [Jekyll's documentation](http://jekyllrb.com/docs/configuration/) for more information.
-
 ~~~ css
 #container {
     float: left;
@@ -117,4 +115,4 @@ module Jekyll
     end
   end
 end
-~~~
+~~~

_posts/blog/2014-08-08-hello-world.md

@@ -3,7 +3,7 @@ layout: post
 title: "Hello World"
 modified:
 categories: blog
-excerpt:
+excerpt: ""
 tags: []
 image:
   feature:

_posts/blog/2015-08-10-mathjax-example.md

@@ -3,7 +3,7 @@ layout: post
 title: "MathJax Example"
 modified:
 categories: blog
-excerpt:
+excerpt: ""
 tags: []
 image:
   feature:

_sass/_syntax.scss

@@ -2,7 +2,11 @@
    Syntax highlighting and formatting
    ========================================================================== */
 
-/* 
+pre.highlight {
+  padding: 1em;
+}
+
+/*
    Pygments.rb and Rouge
    ========================================================================== */
 
@@ -81,7 +85,7 @@
 	.il { color: #009999 } /* Literal.Number.Integer.Long */
 }
 
-/* 
+/*
    Coderay
    ========================================================================== */
 
@@ -112,7 +116,7 @@ ol.CodeRay li { white-space: pre }
 
 .CodeRay {
 
-	.line-numbers, 
+	.line-numbers,
 	.no {
 	  background-color: #ececec;
 	  color: #aaa;
@@ -178,7 +182,7 @@ ol.CodeRay li { white-space: pre }
 	.preprocessor { color: #579; }
 	.pseudo-class { color: #00c; font-weight: bold }
 	.predefined-type { color: #074; font-weight: bold }
-	.reserved, 
+	.reserved,
 	.keyword { color: #000; font-weight: bold }
 
 	.key { color: #808; }

theme-setup/index.md

@@ -16,7 +16,7 @@ General notes and suggestions for customizing **So Simple Theme**.
 
 ## Installation
 
-So Simple now requires [Jekyll](http://jekyllrb.com/) 2.x. Make sure to run `gem update jekyll` if you aren't on the latest version or `gem install jekyll` if this is your first time installing it.
+So Simple now requires [Jekyll](http://jekyllrb.com/) 3.0. Make sure to run `bundle update` if you aren't on the latest version to update all gem dependencies.
 
 If you are creating a new Jekyll site using So Simple follow these steps:
 
@@ -41,7 +41,7 @@ If you want to use So Simple with an existing Jekyll site follow these steps:
 
 ## Running Jekyll
 
-If `jekyll build` and `jekyll serve` throw errors you may have to run Jekyll with `bundle exec` instead.
+The preferred method for running Jekyll is with `bundle exec`, but if you're willing to deal gem conflicts feel free to go cowboy with a `jekyll build` or `jekyll serve`.
 
 > In some cases, running executables without bundle exec may work, if the executable happens to be installed in your system and does not pull in any gems that conflict with your bundle.
 >