Skip to content

Commit

Permalink
Support Jekyll 3.0
Browse files Browse the repository at this point in the history
- Update to Jekyll v3.0
- Switch from Pygments.rb to Rouge for syntax highlighting
- Minor updates to syntax.scss partial and theme documentation
- Include jekyll-gist gem
- Close mmistakes#192, mmistakes#218
  • Loading branch information
mmistakes authored and mirca committed Aug 1, 2017
1 parent f590f61 commit a47d097
Show file tree
Hide file tree
Showing 64 changed files with 1,070 additions and 546 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ _site
*.sublime-workspace
codekit-config.json
node_modules
_asset_bundler_cache
_asset_bundler_cache
.jekyll-metadata
.*.swp
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source "https://rubygems.org"

gem 'jekyll', '2.5.3'
gem 'jekyll-sitemap'
gem 'octopress', '~> 3.0'
gem "jekyll", "~> 3.0"
gem "jekyll-sitemap"
gem "jekyll-gist"
gem "octopress"
51 changes: 11 additions & 40 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +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)
ffi (1.9.10-x86-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)
Expand All @@ -61,39 +41,30 @@ 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)
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)
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
x86-mingw32

DEPENDENCIES
jekyll (= 2.5.3)
jekyll (~> 3.0)
jekyll-gist
jekyll-sitemap
octopress (~> 3.0)
octopress

BUNDLED WITH
1.11.2
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Minimal Mistakes

**[Minimal Mistakes](http://mmistakes.github.io/minimal-mistakes)** is a two column responsive Jekyll theme perfect for powering your GitHub hosted blog.

**Jekyll 3 Update:** A version of Minimal Mistakes compatible with Jekyll 3 can be found in the [`jekyll3` branch](https://github.com/mmistakes/minimal-mistakes/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.
**[Minimal Mistakes](http://mmistakes.github.io/minimal-mistakes)** is a two column responsive Jekyll theme perfect for powering your GitHub hosted blog built. Compatible with Jekyll 3.0 and up.

## Minimal Mistakes is all about:

Expand All @@ -20,6 +18,6 @@ See a [live version of Minimal Mistakes](http://mmistakes.github.io/minimal-mist

## Getting Started

Minimal Mistakes 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.
Minimal Mistakes takes advantage of Sass and data files to make customizing easier. These features require [Jekyll 2.x](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.3) and will not work with older versions of Jekyll.

To learn how to install and use this theme check out the [Setup Guide](http://mmistakes.github.io/minimal-mistakes/theme-setup/) for more information.
27 changes: 15 additions & 12 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
# Site wide configuration

title: Site Title
title: Home
locale: en_US
url:
url: "https://mirca.github.io"


# Jekyll configuration

permalink: /:categories/:title/
markdown: kramdown
highlighter: pygments
highlighter: rouge
sass:
sass_dir: _sass
style: compressed
gems:
- jekyll-sitemap
- jekyll-gist

kramdown:
auto_ids: true
footnote_nr: 1
entity_output: as_char
toc_levels: 1..6
use_coderay: false
enable_coderay: false


# Octopress
Expand All @@ -40,12 +41,12 @@ titlecase: true

# Site owner
owner:
name: Your Name
avatar: bio-photo.jpg
bio: "Describe your self."
email:
disqus-shortname:
twitter: #username
name: Zé Vinícius
avatar: https://raw.githubusercontent.com/mirca/mirca.github.io/master/images/ze.jpg
bio: "O Captain! My Captain!"
email: [email protected]
disqus-shortname: mirca-1
twitter: mircaze
facebook: #username
google:
plus: #username
Expand All @@ -54,9 +55,9 @@ owner:
ad-client:
ad-slot:
bing-verify:
github: #username
github: mirca
stackoverflow: #123456/username from a "http://stackoverflow.com/users/123456/username" link
linkedin: #username
linkedin: #jose-vinicius-de-miranda-cardoso-72471a82
xing: #username
instagram: #username
lastfm: #username
Expand All @@ -73,3 +74,5 @@ owner:

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"]

comments: true
9 changes: 6 additions & 3 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
- title: About
url: /about/

- title: Sample Posts
- title: Posts
url: /posts/

- title: Theme Setup
url: /theme-setup/
- title: Publications
url: /publications/

- title: Software
url: /software/
2 changes: 1 addition & 1 deletion _includes/_disqus_comments.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% if site.owner.disqus-shortname %}
{% if page.comments %}
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ site.owner.disqus-shortname }}'; // required: replace example with your forum shortname
Expand Down
11 changes: 0 additions & 11 deletions _includes/_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,4 @@
<link href='//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic' rel='stylesheet' type='text/css'>

<!-- Icons -->
<!-- 16x16 -->
<link rel="shortcut icon" href="{{ site.url }}/favicon.ico">
<!-- 32x32 -->
<link rel="shortcut icon" href="{{ site.url }}/favicon.png">
<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
<link rel="apple-touch-icon-precomposed" href="{{ site.url }}/images/apple-touch-icon-precomposed.png">
<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.url }}/images/apple-touch-icon-72x72-precomposed.png">
<!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.url }}/images/apple-touch-icon-114x114-precomposed.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.url }}/images/apple-touch-icon-144x144-precomposed.png">
3 changes: 3 additions & 0 deletions _includes/_scripts.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" async
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
<script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="{{ site.url }}/assets/js/scripts.min.js"></script>
{% if site.owner.google.analytics %}
Expand Down
111 changes: 0 additions & 111 deletions _posts/2011-03-10-sample-post.md

This file was deleted.

Loading

0 comments on commit a47d097

Please sign in to comment.