diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4d868e7e3b53c3a41393a3aa4a40d56616da262a
--- /dev/null
+++ b/.github/workflows/ci-master.yml
@@ -0,0 +1,45 @@
+on:
+ push:
+ branches:
+ - master
+
+name: CI
+
+jobs:
+
+ jekyll-latest:
+ name: Build Jekyll site (latest)
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@master
+
+ - name: Build the site in the jekyll/builder container
+ run: |
+ docker run --rm \
+ --volume="${{ github.workspace }}:/srv/jekyll" \
+ jekyll/builder:latest /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && jekyll build && bundle exec just-the-docs rake search:init"
+ jekyll-3-8-5:
+ name: Build Jekyll site (v3.8.5)
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@master
+
+ - name: Build the site in the jekyll/builder container
+ run: |
+ docker run --rm \
+ --volume="${{ github.workspace }}:/srv/jekyll" \
+ jekyll/builder:3.8.5 /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && jekyll build && bundle exec just-the-docs rake search:init"
+ assets:
+ name: Format and test CSS and JS
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js 12.x
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - run: npm install
+ - run: npm test
diff --git a/_config.yml b/_config.yml
index 2ef1604761c323bdfbc515ea67816b81a872fbf4..ddaf13d06b7b8bade33a3360b8ab97b1b6acf6d1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -38,6 +38,9 @@ aux_links:
"Just the Docs on GitHub":
- "//github.com/pmarsceill/just-the-docs"
+# Makes Aux links open in a new tab. Default is false
+aux_links_new_tab: false
+
# Sort order for navigation links
nav_sort: case_insensitive # default, equivalent to nil
# nav_sort: case_sensitive # Capital letters sorted before lowercase
diff --git a/_includes/nav.html b/_includes/nav.html
index 6858dec980294a400ec5211b8a8f42e39d7a852a..93dcf210b46572d4beb55ce2345d31f5f8fe4db6 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -2,12 +2,12 @@
<ul class="navigation-list">
{%- assign ordered_pages_list = site.html_pages | where_exp:"item", "item.nav_order != nil" -%}
{%- assign unordered_pages_list = site.html_pages | where_exp:"item", "item.nav_order == nil" -%}
- {%- if site.nav_sort == 'case_sensitive' -%}
- {%- assign sorted_ordered_pages_list = ordered_pages_list | sort:"nav_order" -%}
- {%- assign sorted_unordered_pages_list = unordered_pages_list | sort:"title" -%}
- {%- else -%}
+ {%- if site.nav_sort == 'case_insensitive' -%}
{%- assign sorted_ordered_pages_list = ordered_pages_list | sort_natural:"nav_order" -%}
{%- assign sorted_unordered_pages_list = unordered_pages_list | sort_natural:"title" -%}
+ {%- else -%}
+ {%- assign sorted_ordered_pages_list = ordered_pages_list | sort:"nav_order" -%}
+ {%- assign sorted_unordered_pages_list = unordered_pages_list | sort:"title" -%}
{%- endif -%}
{%- assign pages_list = sorted_ordered_pages_list | concat: sorted_unordered_pages_list -%}
{%- for node in pages_list -%}
@@ -29,7 +29,7 @@
{%- endif -%}
<a href="{{ child.url | absolute_url }}" class="navigation-list-link{% if page.url == child.url %} active{% endif %}">{{ child.title }}</a>
{%- if child.has_children -%}
- {%- assign grand_children_list = pages_list | where: "parent", child.title -%}
+ {%- assign grand_children_list = pages_list | where: "parent", child.title | where: "grand_parent", node.title -%}
<ul class="navigation-list-child-list">
{%- for grand_child in grand_children_list -%}
<li class="navigation-list-item {% if page.url == grand_child.url %} active{% endif %}">
diff --git a/_layouts/default.html b/_layouts/default.html
index ba551ad384b7a401b33615d68e610358b995f298..4ab8693072dc866385f4be6ec85423dffdd95cf8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -43,7 +43,15 @@ layout: table_wrappers
{% if site.aux_links != nil %}
<ul class="list-style-none text-small aux-nav">
{% for link in site.aux_links %}
- <li class="d-inline-block my-0{% unless forloop.last %} mr-2{% endunless %}"><a href="{{ link.last }}">{{ link.first }}</a></li>
+ <li class="d-inline-block my-0{% unless forloop.last %} mr-2{% endunless %}">
+ <a href="{{ link.last }}"
+ {% if site.aux_links_new_tab %}
+ target="_blank" rel="noopener noreferrer"
+ {% endif %}
+ >
+ {{ link.first }}
+ </a>
+ </li>
{% endfor %}
</ul>
{% endif %}
@@ -75,8 +83,9 @@ layout: table_wrappers
<hr>
<h2 class="text-delta">Table of contents</h2>
<ul>
- {% for child in pages_list %}
- {% if child.parent == page.title and child.title != page.title %}
+ {%- assign children_list = pages_list | where: "parent", node.title -%}
+ {% for child in children_list %}
+ {% if child.parent == page.title and child.title != page.title and child.grand_parent == page.parent %}
<li>
<a href="{{ child.url | absolute_url }}">{{ child.title }}</a>{% if child.summary %} - {{ child.summary }}{% endif %}
</li>
diff --git a/docs/configuration.md b/docs/configuration.md
index f3a7a0235312bf67e782114488871a3639ba4b20..2367efbff76e4ccad829983bb52d5935ea0c6c56 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -47,6 +47,9 @@ search_tokenizer_separator: /[\s/]+/
aux_links:
"Just the Docs on GitHub":
- "//github.com/pmarsceill/just-the-docs"
+
+# Makes Aux links open in a new tab. Default is false
+aux_links_new_tab: false
```
## Heading anchor links
diff --git a/docs/navigation-structure.md b/docs/navigation-structure.md
index e5f29ad2682eb95fc5a07040ffccd11f25831491..c17558292e61515ee89e072c245becaf3378b850 100644
--- a/docs/navigation-structure.md
+++ b/docs/navigation-structure.md
@@ -41,8 +41,9 @@ nav_order: 4
The specified `nav_order` parameters on a site should be all integers or all strings.
Pages without a `nav_order` parameter are ordered alphabetically by their `title`,
and appear after the explicitly-ordered pages at each level.
-To sort all Capital letters before lowercase letters,
-add `nav_sort: case_sensitive` in the configuration file.
+By default, all Capital letters are sorted before all lowercase letters;
+adding `nav_sort: case_insensitive` in the configuration file ignores case
+when sorting strings (but also sorts numbers lexicographically: `10` comes before `1`).
---