diff --git a/CNAME b/CNAME
old mode 100644
new mode 100755
diff --git a/Gemfile b/Gemfile
old mode 100644
new mode 100755
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index 921330e6a..000000000
--- a/Rakefile
+++ /dev/null
@@ -1,76 +0,0 @@
-require "bundler/gem_tasks"
-require "jekyll"
-require "listen"
-
-def listen_ignore_paths(base, options)
- [
- /_config\.ya?ml/,
- /_site/,
- /\.jekyll-metadata/
- ]
-end
-
-def listen_handler(base, options)
- site = Jekyll::Site.new(options)
- Jekyll::Command.process_site(site)
- proc do |modified, added, removed|
- t = Time.now
- c = modified + added + removed
- n = c.length
- relative_paths = c.map{ |p| Pathname.new(p).relative_path_from(base).to_s }
- print Jekyll.logger.message("Regenerating:", "#{relative_paths.join(", ")} changed... ")
- begin
- Jekyll::Command.process_site(site)
- puts "regenerated in #{Time.now - t} seconds."
- rescue => e
- puts "error:"
- Jekyll.logger.warn "Error:", e.message
- Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
- end
- end
-end
-
-task :preview do
- base = Pathname.new('.').expand_path
- options = {
- "source" => base.join('test').to_s,
- "destination" => base.join('test/_site').to_s,
- "force_polling" => false,
- "serving" => true,
- "theme" => "minimal-mistakes-jekyll"
- }
-
- options = Jekyll.configuration(options)
-
- ENV["LISTEN_GEM_DEBUGGING"] = "1"
- listener = Listen.to(
- base.join("_data"),
- base.join("_includes"),
- base.join("_layouts"),
- base.join("_sass"),
- base.join("assets"),
- options["source"],
- :ignore => listen_ignore_paths(base, options),
- :force_polling => options['force_polling'],
- &(listen_handler(base, options))
- )
-
- begin
- listener.start
- Jekyll.logger.info "Auto-regeneration:", "enabled for '#{options["source"]}'"
-
- unless options['serving']
- trap("INT") do
- listener.stop
- puts " Halting auto-regeneration."
- exit 0
- end
-
- loop { sleep 1000 }
- end
- rescue ThreadError
- # You pressed Ctrl-C, oh my!
- end
-
- Jekyll::Commands::Serve.process(options)
-end
diff --git a/_config.yml b/_config.yml
old mode 100644
new mode 100755
index d3f363a28..69cb73f99
--- a/_config.yml
+++ b/_config.yml
@@ -221,7 +221,6 @@ plugins:
- jekyll-feed
- jemoji
- jekyll-redirect-from
- - jekyll-include-cache
# mimic GitHub Pages with --safe
whitelist:
@@ -230,8 +229,7 @@ whitelist:
- jekyll-gist
- jekyll-feed
- jemoji
- - jekyll-redirect-from
- - jekyll-include-cache
+
# Archives
# Type
diff --git a/_data/navigation.yml b/_data/navigation.yml
old mode 100644
new mode 100755
diff --git a/_data/navigation/en_US.yml b/_data/navigation/en_US.yml
old mode 100644
new mode 100755
diff --git a/_data/navigation/es_MX.yml b/_data/navigation/es_MX.yml
old mode 100644
new mode 100755
diff --git a/_data/navigation/it_IT.yml b/_data/navigation/it_IT.yml
old mode 100644
new mode 100755
diff --git a/_data/navigation/pl_PL.yml b/_data/navigation/pl_PL.yml
old mode 100644
new mode 100755
diff --git a/_data/navigation/pt_BR.yml b/_data/navigation/pt_BR.yml
old mode 100644
new mode 100755
diff --git a/_data/ui-text.yml b/_data/ui-text.yml
old mode 100644
new mode 100755
diff --git a/_includes/analytics-providers/custom.html b/_includes/analytics-providers/custom.html
old mode 100644
new mode 100755
diff --git a/_includes/analytics-providers/google-gtag.html b/_includes/analytics-providers/google-gtag.html
deleted file mode 100644
index 16d0cf176..000000000
--- a/_includes/analytics-providers/google-gtag.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/_includes/analytics-providers/google-universal.html b/_includes/analytics-providers/google-universal.html
old mode 100644
new mode 100755
index 68c2674ba..10d65b2ee
--- a/_includes/analytics-providers/google-universal.html
+++ b/_includes/analytics-providers/google-universal.html
@@ -1,7 +1,9 @@
-
diff --git a/_includes/analytics-providers/google.html b/_includes/analytics-providers/google.html
old mode 100644
new mode 100755
index c5742b981..b591b9954
--- a/_includes/analytics-providers/google.html
+++ b/_includes/analytics-providers/google.html
@@ -1,9 +1,6 @@
-
+
\ No newline at end of file
diff --git a/_includes/analytics.html b/_includes/analytics.html
old mode 100644
new mode 100755
index 371469f0a..64a3359aa
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -1,12 +1,10 @@
-{% if jekyll.environment == 'production' and site.analytics.provider and page.analytics != false %}
+{% if site.analytics.provider and page.analytics != false %}
{% case site.analytics.provider %}
{% when "google" %}
{% include /analytics-providers/google.html %}
{% when "google-universal" %}
{% include /analytics-providers/google-universal.html %}
-{% when "google-gtag" %}
- {% include /analytics-providers/google-gtag.html %}
{% when "custom" %}
{% include /analytics-providers/custom.html %}
{% endcase %}
diff --git a/_includes/archive-single.html b/_includes/archive-single.html
old mode 100644
new mode 100755
index 489f00067..dc9ac7375
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -11,27 +11,27 @@
{% endif %}
-
+
{% if include.type == "grid" and teaser %}
{% endif %}
{% if post.read_time %}
- {% include read-time.html %}
+ {% include read-time.html %}
{% endif %}
{% if post.excerpt %}{{ post.excerpt | markdownify | strip_html | truncate: 160 }}
{% endif %}
diff --git a/_includes/author-profile-custom-links.html b/_includes/author-profile-custom-links.html
old mode 100644
new mode 100755
index b89ffcb7d..3560e2588
--- a/_includes/author-profile-custom-links.html
+++ b/_includes/author-profile-custom-links.html
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
old mode 100644
new mode 100755
index 4f0c02cd8..2d1054312
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -1,37 +1,23 @@
-{% assign author = page.author | default: page.authors[0] | default: site.author %}
-{% assign author = site.data.authors[author] | default: author %}
+{% if page.author and site.data.authors[page.author] %}
+ {% assign author = site.data.authors[page.author] %}
+{% else %}
+ {% assign author = site.author %}
+{% endif %}
-
+
{% if author.avatar %}
{% if author.avatar contains "://" %}
- {% assign author_src = author.avatar %}
+
{% else %}
- {% assign author_src = author.avatar | relative_url %}
- {% endif %}
-
- {% if author.home %}
- {% if author.home contains "://" %}
- {% assign author_link = author.home %}
- {% else %}
- {% assign author_link = author.home | relative_url %}
- {% endif %}
-
-
-
- {% else %}
-
+
{% endif %}
{% endif %}
- {% if author.home %}
-
{{ author.name }}
- {% else %}
-
{{ author.name }}
- {% endif %}
+
{{ author.name }}
{% if author.bio %}
{{ author.bio }}
@@ -43,23 +29,15 @@
{{ site.data.ui-text[site.locale].follow_label | remove: ":" | default: "Follow" }}
{% if author.location %}
-
- {{ author.location }}
+
+ {{ author.location }}
{% endif %}
- {% if author.links %}
- {% for link in author.links %}
- {% if link.label and link.url %}
- {{ link.label }}
- {% endif %}
- {% endfor %}
- {% endif %}
-
{% if author.uri %}
- {{ site.data.ui-text[site.locale].website_label | default: "Website" }}
+ {{ site.data.ui-text[site.locale].website_label | default: "Website" }}
{% endif %}
@@ -68,135 +46,143 @@
- {{ site.data.ui-text[site.locale].email_label | default: "Email" }}
+ {{ site.data.ui-text[site.locale].email_label | default: "Email" }}
{% endif %}
{% if author.keybase %}
-
- Keybase
+
+ Keybase
{% endif %}
{% if author.twitter %}
-
- Twitter
+
+ Twitter
{% endif %}
{% if author.facebook %}
-
- Facebook
+
+ Facebook
+
+
+ {% endif %}
+
+ {% if author.google_plus %}
+
+
+ Google+
{% endif %}
{% if author.linkedin %}
-
- LinkedIn
+
+ LinkedIn
{% endif %}
{% if author.xing %}
-
- XING
+
+ XING
{% endif %}
{% if author.instagram %}
-
- Instagram
+
+ Instagram
{% endif %}
{% if author.tumblr %}
-
- Tumblr
+
+ Tumblr
{% endif %}
{% if author.bitbucket %}
-
- Bitbucket
+
+ Bitbucket
{% endif %}
{% if author.github %}
-
- GitHub
+
+ GitHub
{% endif %}
{% if author.gitlab %}
-
- GitLab
+
+ Gitlab
{% endif %}
{% if author.stackoverflow %}
-
- Stack Overflow
+
+ Stackoverflow
{% endif %}
{% if author.lastfm %}
-
- Last.fm
+
+ Last.fm
{% endif %}
{% if author.dribbble %}
-
- Dribbble
+
+ Dribbble
{% endif %}
{% if author.pinterest %}
-
- Pinterest
+
+ Pinterest
{% endif %}
{% if author.foursquare %}
-
- Foursquare
+
+ Foursquare
{% endif %}
{% if author.steam %}
-
- Steam
+
+ Steam
{% endif %}
@@ -204,14 +190,14 @@
{% if author.youtube %}
{% if author.youtube contains "://" %}
-
- YouTube
+
+ YouTube
{% else author.youtube %}
-
- YouTube
+
+ YouTube
{% endif %}
@@ -219,40 +205,40 @@
{% if author.soundcloud %}
-
- SoundCloud
+
+ Soundcloud
{% endif %}
{% if author.weibo %}
-
- Weibo
+
+ Weibo
{% endif %}
{% if author.flickr %}
-
- Flickr
+
+ Flickr
{% endif %}
{% if author.codepen %}
-
- CodePen
+
+ CodePen
{% endif %}
{% if author.vine %}
-
- Vine
+
+ Vine
{% endif %}
diff --git a/_includes/base_path b/_includes/base_path
new file mode 100755
index 000000000..36826c4f2
--- /dev/null
+++ b/_includes/base_path
@@ -0,0 +1,5 @@
+{% if site.url %}
+ {% assign base_path = site.url | append: site.baseurl %}
+{% else %}
+ {% assign base_path = site.github.url %}
+{% endif %}
\ No newline at end of file
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
old mode 100644
new mode 100755
index cba3d415f..6eec214b9
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs.html
@@ -13,12 +13,12 @@
{% endif %}
-
+
{% assign crumbs = page.url | split: '/' %}
{% assign i = 1 %}
{% for crumb in crumbs offset: 1 %}
{% if forloop.first %}
-
+
{{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }}
@@ -28,8 +28,8 @@
{{ page.title }}
{% else %}
{% assign i = i | plus: 1 %}
-
- {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
+
+ {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
{{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }}
diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade.html
old mode 100644
new mode 100755
index ec6ad0acc..e8d8b2625
--- a/_includes/browser-upgrade.html
+++ b/_includes/browser-upgrade.html
@@ -1,3 +1,3 @@
+
+
\ No newline at end of file
diff --git a/_includes/category-list.html b/_includes/category-list.html
old mode 100644
new mode 100755
index d684a2829..9dae0b827
--- a/_includes/category-list.html
+++ b/_includes/category-list.html
@@ -10,17 +10,17 @@
{% endcomment %}
- {% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}|{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+ {% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}#{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
{% assign category_hashes = page_categories | split: ',' | sort %}
- {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }}
+ {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }}
{% for hash in category_hashes %}
- {% assign keyValue = hash | split: '|' %}
+ {% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
- {{ category_word }} {% unless forloop.last %}, {% endunless %}
+ {{ category_word }} {% unless forloop.last %}, {% endunless %}
{% endfor %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/_includes/comment.html b/_includes/comment.html
old mode 100644
new mode 100755
index cebedabfb..7b33f46d5
--- a/_includes/comment.html
+++ b/_includes/comment.html
@@ -1,9 +1,9 @@
-
\ No newline at end of file
+
diff --git a/_includes/figure b/_includes/figure
old mode 100644
new mode 100755
index 8e9bdd581..da829e48f
--- a/_includes/figure
+++ b/_includes/figure
@@ -3,10 +3,10 @@
{% if include.image_path contains "://" %}
"{{ include.image_path }}"
{% else %}
- "{{ include.image_path | relative_url }}"
+ "{{ include.image_path | absolute_url }}"
{% endif %}
alt="{% if include.alt %}{{ include.alt }}{% endif %}">
{% if include.caption %}
-
- {{ include.caption | markdownify | remove: "" | remove: "
" }}
- {% endif %}
+
{{ include.caption | markdownify | remove: "" | remove: "
" }}
+ {% endif %}
+
diff --git a/_includes/footer.html b/_includes/footer.html
old mode 100644
new mode 100755
index 2bc78963c..eca25824a
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,19 +1,5 @@
-
-
-
+{% include base_path %}
+{% assign split_path = page.path | split: "/" %}
+{% assign locale = split_path[1] %}
+{% assign titles = site.data.navigation[locale].footer %}
+
diff --git a/_includes/footer/custom.html b/_includes/footer/custom.html
old mode 100644
new mode 100755
index d512599d1..8ca92cad6
--- a/_includes/footer/custom.html
+++ b/_includes/footer/custom.html
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
diff --git a/_includes/gallery b/_includes/gallery
old mode 100644
new mode 100755
index 97022aa88..67fb3625a
--- a/_includes/gallery
+++ b/_includes/gallery
@@ -4,16 +4,12 @@
{% assign gallery = page.gallery %}
{% endif %}
-{% if include.layout %}
- {% assign gallery_layout = include.layout %}
+{% if gallery.size == 2 %}
+ {% assign gallery_layout = 'half' %}
+{% elsif gallery.size >= 3 %}
+ {% assign gallery_layout = 'third' %}
{% else %}
- {% if gallery.size == 2 %}
- {% assign gallery_layout = 'half' %}
- {% elsif gallery.size >= 3 %}
- {% assign gallery_layout = 'third' %}
- {% else %}
- {% assign gallery_layout = '' %}
- {% endif %}
+ {% assign gallery_layout = '' %}
{% endif %}
@@ -23,7 +19,7 @@
{% if img.url contains "://" %}
"{{ img.url }}"
{% else %}
- "{{ img.url | relative_url }}"
+ "{{ img.url | absolute_url }}"
{% endif %}
{% if img.title %}title="{{ img.title }}"{% endif %}
>
@@ -31,7 +27,7 @@
{% if img.image_path contains "://" %}
"{{ img.image_path }}"
{% else %}
- "{{ img.image_path | relative_url }}"
+ "{{ img.image_path | absolute_url }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
@@ -40,7 +36,7 @@
{% if img.image_path contains "://" %}
"{{ img.image_path }}"
{% else %}
- "{{ img.image_path | relative_url }}"
+ "{{ img.image_path | absolute_url }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
{% endif %}
@@ -48,4 +44,4 @@
{% if include.caption %}
{{ include.caption | markdownify | remove: "" | remove: "
" }}
{% endif %}
-
\ No newline at end of file
+
diff --git a/_includes/group-by-array b/_includes/group-by-array
old mode 100644
new mode 100755
index 708de41ae..528e40b10
--- a/_includes/group-by-array
+++ b/_includes/group-by-array
@@ -44,4 +44,4 @@
{% assign group_items = group_items | push: __item %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/_includes/head.html b/_includes/head.html
old mode 100644
new mode 100755
index cb68465f4..d8a8713e5
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -2,9 +2,11 @@
{% include seo.html %}
-
+
-
+
+
+
-
+
-
+{% include base_path %}
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/_includes/masthead.html b/_includes/masthead.html
old mode 100644
new mode 100755
index b2aca064e..52af9a67a
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -1,43 +1,71 @@
-{% if site.logo contains "://" %}
- {% capture logo_path %}{{ site.logo }}{% endcapture %}
-{% else %}
- {% capture logo_path %}{{ site.logo }}{% endcapture %}
-{% endif %}
-
-
+
diff --git a/_includes/nav_list b/_includes/nav_list
old mode 100644
new mode 100755
index b1d06c304..ba7dd5978
--- a/_includes/nav_list
+++ b/_includes/nav_list
@@ -1,47 +1,32 @@
-{% assign navigation = site.data.navigation[include.nav] %}
+{% assign split_path = page.path | split: "/" %}
+{% assign locale = split_path[1] %}
+{% if locale == 'en_US' %}
+ {% assign locale_var = '/' %}
+{% else %}
+ {% assign locale_var = locale | prepend:'/' | append:'/' %}
+{% endif %}
+
+{% assign title = site.data.navigation[locale].sidebar_title %}
+{% assign navigation = site.data.navigation[locale].sidebar_pages %}
{% if page.sidebar.title %}{{ page.sidebar.title }} {% endif %}
{{ site.data.ui-text[site.locale].menu_label | default: "Toggle Menu" }}
- {% for nav in navigation %}
-
- {% if nav.url %}
- {% comment %} internal/external URL check {% endcomment %}
- {% if nav.url contains "://" %}
- {% assign nav_url = nav.url %}
+
+ {{ title[0].title }}
+
+ {% for link in site.data.navigation[locale].sidebar_pages %}
+ {% if link.url == "/" %}
+ {{ link.title }}
+ {% elsif link.url == "multiple-options" %}
+ ({{ link.title }})
{% else %}
- {% assign nav_url = nav.url | relative_url %}
+ {{ link.title }}
{% endif %}
-
- {{ nav.title }}
- {% else %}
- {{ nav.title }}
- {% endif %}
-
- {% if nav.children != null %}
-
- {% for child in nav.children %}
- {% comment %} internal/external URL check {% endcomment %}
- {% if child.url contains "://" %}
- {% assign child_url = child.url %}
- {% else %}
- {% assign child_url = child.url | relative_url %}
- {% endif %}
-
- {% comment %} set "active" class on current page {% endcomment %}
- {% if child.url == page.url %}
- {% assign active = "active" %}
- {% else %}
- {% assign active = "" %}
- {% endif %}
-
- {{ child.title }}
- {% endfor %}
-
- {% endif %}
-
- {% endfor %}
+ {% endfor %}
+
+
-
\ No newline at end of file
+
diff --git a/_includes/page__hero.html b/_includes/page__hero.html
old mode 100644
new mode 100755
index 98bff72aa..93e9155fb
--- a/_includes/page__hero.html
+++ b/_includes/page__hero.html
@@ -1,19 +1,19 @@
{% if page.header.image contains "://" %}
{% capture img_path %}{{ page.header.image }}{% endcapture %}
{% else %}
- {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %}
+ {% capture img_path %}{{ page.header.image | absolute_url }}{% endcapture %}
{% endif %}
{% if page.header.cta_url contains "://" %}
{% capture cta_path %}{{ page.header.cta_url }}{% endcapture %}
{% else %}
- {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %}
+ {% capture cta_path %}{{ page.header.cta_url | absolute_url }}{% endcapture %}
{% endif %}
{% if page.header.overlay_image contains "://" %}
{% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %}
{% elsif page.header.overlay_image %}
- {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %}
+ {% capture overlay_img_path %}{{ page.header.overlay_image | absolute_url }}{% endcapture %}
{% endif %}
{% if page.header.overlay_filter contains "rgba" %}
@@ -35,33 +35,22 @@
>
{% if page.header.overlay_color or page.header.overlay_image %}
-
+
{% if paginator and site.paginate_show_page_num %}
{{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
{% else %}
{{ page.title | default: site.title | markdownify | remove: " " | remove: "
" }}
{% endif %}
- {% if page.header.show_overlay_excerpt != false and page.excerpt %}
+ {% if page.excerpt %}
{{ page.excerpt | markdownify | remove: "
" | remove: "
" }}
{% endif %}
- {% if page.read_time %}
-
{% include read-time.html %}
+ {% if site.read_time and page.read_time %}
+
{% include read-time.html %}
{% endif %}
{% if page.header.cta_url %}
{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}
{% endif %}
- {% if page.header.actions %}
-
- {% for action in page.header.actions %}
- {% if action.url contains "://" %}
- {% assign url = action.url %}
- {% else %}
- {% assign url = action.url | relative_url %}
- {% endif %}
- {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}
- {% endfor %}
- {% endif %}
{% else %}
diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html
old mode 100644
new mode 100755
diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html
old mode 100644
new mode 100755
index 75c76c81d..f10b2026a
--- a/_includes/page__taxonomy.html
+++ b/_includes/page__taxonomy.html
@@ -4,4 +4,4 @@
{% if site.category_archive.type and page.categories[0] %}
{% include category-list.html %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/_includes/paginator.html b/_includes/paginator.html
old mode 100644
new mode 100755
index 592a2cfcf..cf49ae8a2
--- a/_includes/paginator.html
+++ b/_includes/paginator.html
@@ -1,13 +1,13 @@
{% if paginator.total_pages > 1 %}
-
\ No newline at end of file
+
diff --git a/_layouts/archive.html b/_layouts/archive.html
old mode 100644
new mode 100755
index 08beb89af..bece6045d
--- a/_layouts/archive.html
+++ b/_layouts/archive.html
@@ -19,8 +19,8 @@ layout: default
{% unless page.header.overlay_color or page.header.overlay_image %}
-
{{ page.title }}
+ {{ page.title }}
{% endunless %}
{{ content }}
-
\ No newline at end of file
+
diff --git a/_layouts/categories.html b/_layouts/categories.html
deleted file mode 100644
index aa2c6e80e..000000000
--- a/_layouts/categories.html
+++ /dev/null
@@ -1,42 +0,0 @@
----
-layout: archive
----
-
-{{ content }}
-
-{% assign categories_max = 0 %}
-{% for category in site.categories %}
- {% if category[1].size > categories_max %}
- {% assign categories_max = category[1].size %}
- {% endif %}
-{% endfor %}
-
-
- {% for i in (1..categories_max) reversed %}
- {% for category in site.categories %}
- {% if category[1].size == i %}
-
-
- {{ category[0] }} {{ i }}
-
-
- {% endif %}
- {% endfor %}
- {% endfor %}
-
-
-{% for i in (1..categories_max) reversed %}
- {% for category in site.categories %}
- {% if category[1].size == i %}
-
- {% endif %}
- {% endfor %}
-{% endfor %}
diff --git a/_layouts/category.html b/_layouts/category.html
deleted file mode 100644
index 79b81ce09..000000000
--- a/_layouts/category.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: archive
----
-
-{{ content }}
-
-
- {% include posts-category.html taxonomy=page.taxonomy type=page.entries_layout %}
-
diff --git a/_layouts/collection.html b/_layouts/collection.html
deleted file mode 100644
index 3bcd916a6..000000000
--- a/_layouts/collection.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: archive
----
-
-{{ content }}
-
-
- {% include documents-collection.html collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=page.entries_layout %}
-
diff --git a/_layouts/compress.html b/_layouts/compress.html
old mode 100644
new mode 100755
index bb34487d2..8248010b4
--- a/_layouts/compress.html
+++ b/_layouts/compress.html
@@ -1,10 +1,10 @@
---
# Jekyll layout that compresses HTML
-# v3.1.0
+# v3.0.2
# http://jch.penibelst.de/
# © 2014–2015 Anatol Broder
# MIT License
---
{% capture _LINE_FEED %}
-{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains " " %}{% endif %}{% unless _pre_before contains " " and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " ; ; ;" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} Step Bytes raw {{ content | size }}{% if _profile_endings %} endings {{ _profile_endings }}{% endif %}{% if _profile_startings %} startings {{ _profile_startings }}{% endif %}{% if _profile_comments %} comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %} collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %} clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %}
+{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains " " %}{% endif %}{% unless _pre_before contains " " and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " ; ; ;" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} Step Bytes raw {{ content | size }}{% if _profile_endings %} endings {{ _profile_endings }}{% endif %}{% if _profile_startings %} startings {{ _profile_startings }}{% endif %}{% if _profile_comments %} comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %} collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %} clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
old mode 100644
new mode 100755
index a3dfd7009..739b9f059
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,10 +3,10 @@
@@ -15,24 +15,16 @@
- {% include_cached skip-links.html %}
- {% include_cached browser-upgrade.html %}
- {% include_cached masthead.html %}
-
- {{ content }}
-
+ {% include browser-upgrade.html %}
+ {% include masthead.html %}
- {% if site.search == true %}
-
- {% include_cached search/search_form.html %}
-
- {% endif %}
+ {{ content }}
-