Theme: Avoid empty TOC and disable TOC on non-content pages

* No TOC on group index pages.
* No TOC if there are no headings.

This applies allejo/jekyll-toc#60 as hotfix.

_includes/sidebar.html

@@ -41,7 +41,6 @@
 
 {%- endcomment -%}
 <aside class="sidebar" role="complementary">
-{%- if include.blocks -%}
 {%- for block in site.data[include.blocks] -%}
 	{%- assign block_type = block.type | default: "group" -%}
 	{%- assign block_title = block.title -%}
@@ -96,14 +95,15 @@ <h4 {%- if block_expand %} class="sidebar-title-open"{% endif %}>{% if block_url
 {%- endfor -%}
 
 {%- if include.toc -%}
-<hr>
-{%- endif -%}
-{%- endif -%}
-
-{%- if include.toc -%}
-	<div class="toc-wrapper">
-	<h4>Table of contents</h4>
-	{%- include toc.html html=content sanitize=true h_max=3 ordered=true skip_no_ids=true class="toc" item_class="sidebar-item" -%}
-	</div>
-{%- endif -%}
+	{%- capture jekyll_toc -%}
+		{%- include toc.html html=content sanitize=true h_max=3 ordered=true skip_no_ids=true class="toc" item_class="sidebar-item" -%}
+	{%- endcapture -%}
+	{%- if jekyll_toc != '' -%}
+		{%- if include.blocks -%}
+		<hr>
+		{%- endif -%}
+		<div class="toc-wrapper">
+		<h4>Table of contents</h4>{{ jekyll_toc }}</div>
+	{%- endif -%}
+{%- endif %}
 </aside>

_includes/toc.html

@@ -179,4 +179,4 @@
             {% capture jekyll_toc %}<{{ listModifier }}{{ rootAttributes }}>{{ nodes | shift | join: '>' }}>{% endcapture %}
         {% endif %}
     {% endif %}
-{% endcapture %}{% assign tocWorkspace = '' %}{{ deprecation_warnings }}{{ jekyll_toc }}
+{% endcapture %}{% assign tocWorkspace = '' %}{{ deprecation_warnings }}{{ jekyll_toc -}}

_layouts/group.html

@@ -1,5 +1,7 @@
 ---
 layout: page-api
+amethyst:
+  toc: false
 
 # Parameters:
 #

_layouts/page-api.html

@@ -35,5 +35,9 @@ <h1>{{ page.title }}</h1>
     {%- endif %}
     {{- content }}
 </div>
-{% include sidebar.html blocks="sidebar_api" toc=true %}
+{%- assign toc = true -%}
+{%- if layout.amethyst.toc == false -%}
+    {%- assign toc = false -%}
+{%- endif %}
+{% include sidebar.html blocks="sidebar_api" toc=toc %}
 </div>

_sass/amethyst.scss

@@ -710,6 +710,10 @@ table {
     padding-left: 4px;
 }
 
+.sidebar hr {
+    margin-bottom: $size-spacing;
+}
+
 .sidebar-list {
     margin-top: 0;
     padding: 0;
@@ -750,7 +754,8 @@ table {
     margin: 0;
     padding: 0;
 }
-.toc .sidebar-item {
+.toc .sidebar-item,
+.toc .sidebar-item a {
     border-left: 0;
 }