N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/update-dependencies' into develop

Browse source
This commit is contained in:
Michael Rose 2016-05-29 21:13:09 -04:00
commit f1a7470d3b
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Gemfile.lock
View file

@ -15,15 +15,15 @@ GEM
colorator (0.1)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.6.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
gemoji (2.1.0)
github-pages (78)
github-pages (80)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.5)
jekyll (= 3.1.6)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
@ -47,11 +47,11 @@ GEM
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.4.0)
html-pipeline (2.4.1)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.5)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
@ -92,7 +92,7 @@ GEM
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.0.0)
minitest (5.8.4)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
@ -117,7 +117,6 @@ GEM
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
wdm (0.1.1)
PLATFORMS
ruby
@ -125,7 +124,6 @@ PLATFORMS
DEPENDENCIES
github-pages
wdm (~> 0.1.0)
BUNDLED WITH
1.11.2

4
_config.yml
View file

@ -179,10 +179,10 @@ whitelist:
# - <base_path>/tags/my-awesome-tag/index.html ~> path: /tags/
# - <base_path/categories/my-awesome-category/index.html ~> path: /categories/
# - <base_path/my-awesome-category/index.html ~> path: /
categories:
category_archive:
type: liquid
path: /categories/
tags:
tag_archive:
type: liquid
path: /tags/
# https://github.com/jekyll/jekyll-archives

6
_includes/category-list.html
View file

@ -2,14 +2,14 @@
{% include base_path %}
{% case site.categories.type %}
{% case site.category_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
{% if site.categories.path %}
{% if site.category_archive.path %}
{% comment %}
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@ -23,7 +23,7 @@
{% for hash in category_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.categories.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
<a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %}
</span>
</p>

4
_includes/page__taxonomy.html
View file

@ -1,9 +1,9 @@
{% include base_path %}
{% if site.tags.type and page.tags[0] %}
{% if site.tag_archive.type and page.tags[0] %}
{% include tag-list.html %}
{% endif %}
{% if site.categories.type and page.categories[0] %}
{% if site.category_archive.type and page.categories[0] %}
{% include category-list.html %}
{% endif %}

6
_includes/tag-list.html
View file

@ -1,13 +1,13 @@
{% include base_path %}
{% case site.tags.type %}
{% case site.tag_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
{% if site.tags.path %}
{% if site.tag_archive.path %}
{% comment %}
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@ -21,7 +21,7 @@
{% for hash in tag_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tags.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
<a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %}
</span>
</p>