Apply suggestions from code review

Thanks Kevin! - split up adding `.DS_Store` to `.gitignore` - conditionally add search icons only if search is enabled - fix parent/grandparent structure computation for minimal layout - fix unbalanced indentation in minimal layout Co-authored-by: Kevin Lin <hello@kevinl.info>
just-the-docs · Dec 26, 2022 · bf8a742 · bf8a742
1 parent 93cc3f0
commit bf8a742
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,3 @@
 _site
 Gemfile.lock
 node_modules
-.DS_Store
diff --git a/_includes/icons/icons.html b/_includes/icons/icons.html
@@ -1,8 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
   {% include icons/link.html %}
-  {% include icons/search.html %}
   {% include icons/menu.html %}
   {% include icons/expand.html %}
-  {% include icons/document.html %}
   {% include icons/external_link.html %}
+  {% if site.search_enabled != false %}
+    {% include icons/document.html %}
+    {% include icons/search.html %}
+  {% endif %}
 </svg>
diff --git a/_layouts/minimal.html b/_layouts/minimal.html
@@ -9,24 +9,42 @@
 <body>
   <a class="skip-to-main" href="#main-content">Skip to main content</a>
   {% include icons/icons.html %}
-
-  <div class="main" id="top">
-    <div id="main-content-wrap" class="main-content-wrap">
-      {% include components/breadcrumbs.html %}
-      <div id="main-content" class="main-content" role="main">
-        {% if site.heading_anchors != false %}
-          {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
-        {% else %}
-          {{ content }}
+  {% capture nav %}
+    {% assign pages_top_size = site.html_pages
+        | where_exp:"item", "item.title != nil"
+        | where_exp:"item", "item.parent == nil"
+        | where_exp:"item", "item.nav_exclude != true"
+        | size %}
+    {% if pages_top_size > 0 %}
+      {% include nav.html pages=site.html_pages key=nil %}
+    {% endif %}
+    {% if site.just_the_docs.collections %}
+      {% assign collections_size = site.just_the_docs.collections | size %}
+      {% for collection_entry in site.just_the_docs.collections %}
+        {% assign collection_key = collection_entry[0] %}
+        {% assign collection_value = collection_entry[1] %}
+        {% assign collection = site[collection_key] %}
+        {% if collection_value.nav_exclude != true %}
+          {% include nav.html pages=collection key=collection_key %}
         {% endif %}
+      {% endfor %}
+    {% endif %}
+  {% endcapture %}
+  <div id="main-content-wrap" class="main-content-wrap" id="top">
+    {% include components/breadcrumbs.html %}
+    <div id="main-content" class="main-content" role="main">
+      {% if site.heading_anchors != false %}
+        {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
+      {% else %}
+        {{ content }}
+      {% endif %}
 
-        {% if page.has_children == true and page.has_toc != false %}
-          {% include components/children_nav.html %}
-        {% endif %}
+      {% if page.has_children == true and page.has_toc != false %}
+        {% include components/children_nav.html %}
+      {% endif %}
 
-        {% include components/footer.html %}
+      {% include components/footer.html %}
 
-      </div>
     </div>
   </div>