diff --git a/_layouts/default.html b/_layouts/default.html
index 606b1479..37270fdf 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -14,12 +14,11 @@
{% include head.html %}
- {% include sidebar.html lang=lang %}
+ {% include topbar.html lang=lang %}
- {% include topbar.html lang=lang %} {{ content }} {% include
- search-results.html lang=lang %}
+ {{ content }} {% include search-results.html lang=lang %}
diff --git a/_layouts/home.html b/_layouts/home.html
index a5324a62..2ce48608 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -40,67 +40,41 @@
{% endfor %}
{% endif %}
+{% assign intro = site.data.about.intro %}
+
+{% if paginator.page == 1 %}
+
+{% endif %}
+
+{% comment %} Sort categories by post count: "0025|web" strings sort lexicographically {% endcomment %}
+{% assign category_keys = '' | split: '' %}
+{% for category in site.categories %}
+ {% assign count = category[1] | size | prepend: '0000' | slice: -4, 4 %}
+ {% assign key = count | append: '|' | append: category[0] %}
+ {% assign category_keys = category_keys | push: key %}
+{% endfor %}
+{% assign category_keys = category_keys | sort | reverse %}
+
+
diff --git a/_layouts/page.html b/_layouts/page.html
index 6c9f17e8..8c8dd288 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,9 +5,14 @@
{% include lang.html %} {% include origin-type.html %} {% if
layout.tail_includes %} {% assign has_tail = true %} {% endif %}
-
+{% assign single_column_layouts = 'home,archives,tags,categories,tag,category' | split: ',' %}
+{% if single_column_layouts contains page.layout %}
+ {% assign single_column = true %}
+{% endif %}
+
+
-
+
{% capture padding %} {% unless page.layout == 'home' %}px-1{% endunless %}
{% endcapture %}
@@ -25,22 +30,26 @@
{{ title }}
+ {% unless single_column %}
+ {% unless page.layout == 'post' %}
{% include update-list.html lang=lang %} {% include trending-tags.html
lang=lang %}
+ {% endunless %}
{% for _include in layout.panel_includes %} {% assign _include_path =
_include | append: '.html' %} {% include {{ _include_path }} lang=lang %} {%
endfor %}
+ {% endunless %}
{% if has_tail %}
-
+
{% for _include in layout.tail_includes %} {% assign _include_path =
_include | append: '.html' %} {% include {{ _include_path }} lang=lang %} {%
diff --git a/_layouts/post.html b/_layouts/post.html
index c9cf2e17..21e8e1f8 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -11,83 +11,89 @@
{% include lang.html %}
-
{{ page.title }}
-
-
-
-
- {{ site.data.locales[lang].post.posted }}
- {% include datetime.html date=page.date tooltip=true lang=lang %}
-
-
-
- {% if page.last_modified_at and page.last_modified_at != page.date %}
-
- {{ site.data.locales[lang].post.updated }}
- {% include datetime.html date=page.last_modified_at tooltip=true lang=lang %}
-
- {% endif %}
-
- {% if page.image %}
- {% capture src %}src="{{ page.image.path | default: page.image }}"{% endcapture %}
- {% capture class %}class="preview-img{% if page.image.no_bg %}{{ ' no-bg' }}{% endif %}"{% endcapture %}
- {% capture alt %}alt="{{ page.image.alt | default: "Preview Image" }}"{% endcapture %}
-
- {% capture lqip %}
- {% if page.image.lqip %}
- lqip="{{ page.image.lqip }}"
- {% endif %}
- {% endcapture %}
-
-
-
![]()
- {%- if page.image.alt -%}
-
{{ page.image.alt }}
- {%- endif -%}
-
+