diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 8efd188d4c3c487184bd605e3f89c347d0cbfe85..fd77ad0a8fa6d2cf09a5a869d86d426261c3a9e0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
- url: https://github.com/pmarsceill/just-the-docs/discussions
+ url: https://github.com/just-the-docs/just-the-docs/discussions
about: Ask questions and discuss with other community members
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index bdfde2a0eaa2b6a85494f07775e56a275798a51f..6a1034e28eddb31e7eddde9d1fdb067976085577 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,33 +1,33 @@
references:
- v+
- - master
-name-template: 'v$RESOLVED_VERSION 🌈'
-tag-template: 'v$RESOLVED_VERSION'
+ - main
+name-template: "v$RESOLVED_VERSION 🌈"
+tag-template: "v$RESOLVED_VERSION"
categories:
- - title: '🚀 Features'
+ - title: "🚀 Features"
labels:
- - 'feature'
- - 'enhancement'
- - title: '🛠Bug Fixes'
+ - "feature"
+ - "enhancement"
+ - title: "🛠Bug Fixes"
labels:
- - 'fix'
- - 'bugfix'
- - 'bug'
- - title: '🧰 Maintenance'
- label:
- - 'chore'
- - 'dependencies'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+ - "fix"
+ - "bugfix"
+ - "bug"
+ - title: "🧰 Maintenance"
+ label:
+ - "chore"
+ - "dependencies"
+change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
version-resolver:
major:
labels:
- - 'next-major-release'
+ - "next-major-release"
minor:
labels:
- - 'next-minor-release'
+ - "next-minor-release"
patch:
labels:
- - 'patch'
+ - "patch"
default: minor
template: |
## Changes
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 6d41eb596a0919cbf7f87454616697d008185ed9..4f970d4cfc4612b394cf40b8bd202020aea09783 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -1,45 +1,42 @@
-on:
+on:
push:
branches:
- - master
+ - main
-name: Master branch CI
+name: main branch CI
jobs:
-
jekyll-latest:
name: Build Jekyll site (latest)
runs-on: ubuntu-latest
steps:
+ - uses: actions/checkout@main
- - 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 && bundle install && bundle exec jekyll build && bundle exec rake search:init"
+ - 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 && bundle install && bundle exec jekyll build && bundle exec rake search:init"
jekyll-3-8-5:
name: Build Jekyll site (v3.8.5)
runs-on: ubuntu-latest
steps:
+ - uses: actions/checkout@main
- - 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 && bundle install && bundle exec jekyll build && bundle exec rake search:init"
+ - 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 && bundle install && bundle exec jekyll build && bundle exec 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
+ - 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/.github/workflows/publish.yml b/.github/workflows/publish-gem.yml
similarity index 60%
rename from .github/workflows/publish.yml
rename to .github/workflows/publish-gem.yml
index bba33db1b4be52ebf99ac2e90524458adc5211d2..3f1943ea28f0e4df674966ac80e122d11f14450d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish-gem.yml
@@ -1,30 +1,31 @@
-name: Publish Gem
+name: Publish Ruby Gem
-on: [release]
+on:
+ workflow_dispatch
jobs:
build:
- name: Build + Publish
+ name: Publish
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@master
+ - uses: actions/checkout@v2
- name: Set up Ruby 2.6
uses: actions/setup-ruby@v1
with:
- version: 2.6.x
+ ruby-version: 2.6.x
- name: Publish to GPR
run: |
mkdir -p $HOME/.gem
touch $HOME/.gem/credentials
chmod 0600 $HOME/.gem/credentials
- printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
- gem build just-the-docs.gemspec
+ printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+ gem build *.gemspec
gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
env:
- GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
- OWNER: pmarsceill
+ GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+ OWNER: ${{ github.repository_owner }}
- name: Publish to RubyGems
run: |
@@ -32,8 +33,7 @@ jobs:
touch $HOME/.gem/credentials
chmod 0600 $HOME/.gem/credentials
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
- gem build just-the-docs.gemspec
+ gem build *.gemspec
gem push *.gem
env:
- GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
-
+ GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
diff --git a/.prettierignore b/.prettierignore
index 5dc073f5a8f3aa8fdb28879e48ca68cc8e76a7e7..692aa342ebface613fa395bb6205ffcef614b16b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,3 +7,4 @@ assets/css/just-the-docs-dark.scss
assets/js/vendor/lunr.min.js
assets/js/search-data.json
assets/js/just-the-docs.js
+*.md
diff --git a/.prettierrc b/.prettierrc
index 284e842b027a9ef2501ce69f31bb09e5297b8f60..70175ce150ccda1fc61eeb3f4ba4308438ca8cb6 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,5 +4,4 @@
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "es5"
-}
-
+}
\ No newline at end of file
diff --git a/404.html b/404.html
index 1e7a37ef8cdad11a67bfafabf2d668b18c294362..5fde9668325462713f0b0434a3612d669a5ee35c 100644
--- a/404.html
+++ b/404.html
@@ -1,6 +1,6 @@
---
layout: default
-title: Page not found
+title: 404
permalink: /404
nav_exclude: true
search_exclude: true
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5f0ddaeb639e0ba85e3f3f87813a68fba4c0daec
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM ruby:2.6
+
+ENV LC_ALL C.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+WORKDIR /usr/src/app
+
+COPY Gemfile just-the-docs.gemspec ./
+RUN gem install bundler && bundle install
+
+EXPOSE 4000
+
diff --git a/README.md b/README.md
index 90dfb6fdbf4be746464c7fbb8e0f9ad585114e4a..019a7415523b69773cef93a8096bb70ec84567d3 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
<p align="right">
- <a href="https://badge.fury.io/rb/just-the-docs"><img src="https://badge.fury.io/rb/just-the-docs.svg" alt="Gem version"></a> <a href="https://github.com/pmarsceill/just-the-docs/actions?query=workflow%3A%22Master+branch+CI%22"><img src="https://github.com/pmarsceill/just-the-docs/workflows/Master%20branch%20CI/badge.svg" alt="Build status"></a>
+ <a href="https://badge.fury.io/rb/just-the-docs"><img src="https://badge.fury.io/rb/just-the-docs.svg" alt="Gem version"></a> <a href="https://github.com/just-the-docs/just-the-docs/actions?query=workflow%3A%22main+branch+CI%22"><img src="https://github.com/just-the-docs/just-the-docs/workflows/main%20branch%20CI/badge.svg" alt="Build status"></a>
</p>
<br><br>
<p align="center">
<h1 align="center">Just the Docs</h1>
<p align="center">A modern, highly customizable, and responsive Jekyll theme for documentation with built-in search.<br>Easily hosted on GitHub Pages with few dependencies.</p>
- <p align="center"><strong><a href="https://pmarsceill.github.io/just-the-docs/">See it in action!</a></strong></p>
+ <p align="center"><strong><a href="https://just-the-docs.github.io/just-the-docs/">See it in action!</a></strong></p>
<br><br><br>
</p>
@@ -13,6 +13,17 @@
## Installation
+### via GitHub Pages remote theme
+
+The quickiest way to use Just The Docs is to use GitHub pages [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) feature in your `config.yml` file:
+
+```yaml
+remote_theme: just-the-docs/just-the-docs
+```
+### via RubyGems:
+
+Alternatively you can install it as a Ruby Gem.
+
Add this line to your Jekyll site's Gemfile:
```ruby
@@ -33,17 +44,21 @@ Or install it yourself as:
$ gem install just-the-docs
+Alternatively, you can run it inside Docker while developing your site
+
+ $ docker-compose up
+
## Usage
-[View the documentation](https://pmarsceill.github.io/just-the-docs/) for usage information.
+[View the documentation](https://just-the-docs.github.io/just-the-docs/) for usage information.
## Contributing
-Bug reports and pull requests are welcome on GitHub at https://github.com/pmarsceill/just-the-docs. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/just-the-docs/just-the-docs. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
### Submitting code changes:
-- Open a [Pull Request](https://github.com/pmarsceill/just-the-docs/pulls)
+- Open a [Pull Request](https://github.com/just-the-docs/just-the-docs/pulls)
- Ensure all CI tests pass
- Await code review
- Bump the version number in `just-the-docs.gemspec` and `package.json` according to [semantic versioning](https://semver.org/).
diff --git a/_config.yml b/_config.yml
index 20bf8a17137a0da76e9517b3dd7761dcc3c62b8f..dbe742f2f73981f43aa3f2c8d41b19fc4e595591 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,10 +16,18 @@
title: Just the Docs
description: A Jekyll theme for documentation
baseurl: "/just-the-docs" # the subpath of your site, e.g. /blog
-url: "https://pmarsceill.github.io" # the base hostname & protocol for your site, e.g. http://example.com
+url: "https://just-the-docs.github.io" # the base hostname & protocol for your site, e.g. http://example.com
permalink: pretty
-exclude: ["node_modules/", "*.gemspec", "*.gem", "Gemfile", "Gemfile.lock", "package.json", "package-lock.json", "script/", "LICENSE.txt", "lib/", "bin/", "README.md", "Rakefile"]
+exclude: ["node_modules/", "*.gemspec", "*.gem", "Gemfile", "Gemfile.lock", "package.json", "package-lock.json", "script/", "LICENSE.txt", "lib/", "bin/", "README.md", "Rakefile"
+, "docs/tests/"
+]
+
+# Regression tests
+# By default, the pages in /docs/tests are excluded when the ste is built.
+# To include them, comment-out the relevant line above.
+# Uncommenting the following line doesn't work - see https://github.com/jekyll/jekyll/issues/4791
+# include: ["docs/tests/"]
# Set a path/url to a logo that will be displayed instead of the title
#logo: "/assets/images/just-the-docs.png"
@@ -33,13 +41,13 @@ search:
heading_level: 2
# Maximum amount of previews per search result
# Default: 3
- previews: 3
+ previews: 2
# Maximum amount of words to display before a matched word in the preview
# Default: 5
- preview_words_before: 5
+ preview_words_before: 3
# Maximum amount of words to display after a matched word in the preview
# Default: 10
- preview_words_after: 10
+ preview_words_after: 3
# Set the search token separator
# Default: /[\s\-/]+/
# Example: enable support for hyphenated search words
@@ -57,14 +65,14 @@ heading_anchors: true
# Aux links for the upper right navigation
aux_links:
"Just the Docs on GitHub":
- - "//github.com/pmarsceill/just-the-docs"
+ - "//github.com/just-the-docs/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
+# nav_sort: case_insensitive # default, equivalent to nil
+nav_sort: case_sensitive # Capital letters sorted before lowercase
# Footer content
# appears at the bottom of every page's main content
@@ -73,7 +81,7 @@ nav_sort: case_insensitive # default, equivalent to nil
back_to_top: true
back_to_top_text: "Back to top"
-footer_content: "Copyright © 2017-2020 Patrick Marsceill. Distributed by an <a href=\"https://github.com/pmarsceill/just-the-docs/tree/master/LICENSE.txt\">MIT license.</a>"
+footer_content: "Copyright © 2017-2020 Patrick Marsceill. Distributed by an <a href=\"https://github.com/just-the-docs/just-the-docs/tree/main/LICENSE.txt\">MIT license.</a>"
# Footer last edited timestamp
last_edit_timestamp: true # show or hide edit time - page must have `last_modified_date` defined in the frontmatter
@@ -84,8 +92,9 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" # uses ruby's time format: https:/
# Footer "Edit this page on GitHub" link text
gh_edit_link: true # show or hide edit this page link
gh_edit_link_text: "Edit this page on GitHub"
-gh_edit_repository: "https://github.com/pmarsceill/just-the-docs" # the github URL for your repo
-gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_repository: "https://github.com/just-the-docs/just-the-docs" # the github URL for your repo
+gh_edit_branch: "main" # the branch that your docs is served from
+# gh_edit_source: docs # the source that your files originate from
gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately
# Color scheme currently only supports "dark", "light"/nil (default), or a custom scheme that you define
@@ -99,6 +108,11 @@ ga_tracking_anonymize_ip: true # Use GDPR compliant Google Analytics settings (t
plugins:
- jekyll-seo-tag
+kramdown:
+ syntax_highlighter_opts:
+ block:
+ line_numbers: false
+
compress_html:
clippings: all
comments: all
@@ -106,3 +120,5 @@ compress_html:
startings: []
blanklines: false
profile: false
+ # ignore:
+ # envs: all
diff --git a/_includes/fix_linenos.html b/_includes/fix_linenos.html
new file mode 100644
index 0000000000000000000000000000000000000000..6243fb093e2c4433e956980548dc9ea5859e15a2
--- /dev/null
+++ b/_includes/fix_linenos.html
@@ -0,0 +1,65 @@
+{%- comment -%}
+This file can be used to fix the HTML produced by Jekyll for highlighted
+code with line numbers.
+
+It works with `{% highlight some_language linenos %}...{% endhighlight %}`
+and with the Kramdown option to add line numbers to fenced code.
+
+The implementation was derived from the workaround provided by
+Dmitry Hrabrov (DeXP) at
+https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901
+
+EXPLANATION
+
+The HTML produced by Rouge highlighting with lie numbers is of the form
+`code table`. Jekyll (<= 4.1.1) always wraps the highlighted HTML
+with `pre`. This wrapping is not only unnecessary, but also transforms
+the conforming HTML produced by Rouge to non-conforming HTML, which
+results in HTML validation error reports.
+
+The fix removes the outer `pre` tags whenever they contain the pattern
+`<table class="rouge-table">`.
+
+Apart from avoiding HTML validation errors, the fix allows the use of
+the [Jekyll layout for compressing HTML](http://jch.penibelst.de),
+which relies on `pre` tags not being nested, according to
+https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-172069842
+
+USAGE
+
+(Any names can be used for `some_var` and `some_language`.)
+
+{% capture some_var %}
+{% highlight some_language linenos %}
+Some code
+{% endhighlight %}
+{% endcapture %}
+{% include fix_linenos.html code=some_var %}
+
+For code fences:
+
+{% capture some_var %}
+```some_language
+Some code
+```
+{% endcapture %}
+{% assign some_var = some_var | markdownify %}
+{% include fix_linenos.html code=some_var %}
+
+CAVEATS
+
+The above does not work when `Some code` happens to contain the matched string
+`<table class="rouge-table">`.
+
+The use of this file overwrites the variable `fix_linenos_code` with `nil`.
+
+{%- endcomment -%}
+
+{% assign fix_linenos_code = include.code %}
+{% if fix_linenos_code contains '<table class="rouge-table">' %}
+ {% assign fix_linenos_code = fix_linenos_code | replace: '<pre class="highlight">', '<pre>' %}
+ {% assign fix_linenos_code = fix_linenos_code | replace: "<pre><code", "<code" %}
+ {% assign fix_linenos_code = fix_linenos_code | replace: "</code></pre>", "</code>" %}
+{% endif %}
+{{ fix_linenos_code }}
+{% assign fix_linenos_code = nil %}
diff --git a/_includes/footer_custom.html b/_includes/footer_custom.html
new file mode 100644
index 0000000000000000000000000000000000000000..64e08c290fe651d127773ca7f7ae1aaa8f539686
--- /dev/null
+++ b/_includes/footer_custom.html
@@ -0,0 +1,3 @@
+{%- if site.footer_content -%}
+ <p class="text-small text-grey-dk-100 mb-0">{{ site.footer_content }}</p>
+{%- endif -%}
diff --git a/_includes/head.html b/_includes/head.html
index 4f22497bb19f1c3cb3dff6771d3c8c8f37c63c3b..c0f73d7409de9ee518b6e166d106edb2b49a4c99 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,9 +10,9 @@
{% endif %}
{% endunless %}
- <link rel="shortcut icon" href="{{ 'favicon.ico' | absolute_url }}" type="image/x-icon">
+ <link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
- <link rel="stylesheet" href="{{ '/assets/css/just-the-docs-default.css' | absolute_url }}">
+ <link rel="stylesheet" href="{{ '/assets/css/just-the-docs-default.css' | relative_url }}">
{% if site.ga_tracking != nil %}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.ga_tracking }}"></script>
@@ -27,9 +27,9 @@
{% endif %}
{% if site.search_enabled != false %}
- <script type="text/javascript" src="{{ '/assets/js/vendor/lunr.min.js' | absolute_url }}"></script>
+ <script type="text/javascript" src="{{ '/assets/js/vendor/lunr.min.js' | relative_url }}"></script>
{% endif %}
- <script type="text/javascript" src="{{ '/assets/js/just-the-docs.js' | absolute_url }}"></script>
+ <script type="text/javascript" src="{{ '/assets/js/just-the-docs.js' | relative_url }}"></script>
<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/_includes/header_custom.html b/_includes/header_custom.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/_includes/nav.html b/_includes/nav.html
index f2ec7e5c4b72f8d50aed436b787884651acd549b..325a68c88404259b63a85ef0bbad05c93c91737b 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,55 +1,99 @@
<ul class="nav-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" -%}
+ {%- assign titled_pages = include.pages
+ | where_exp:"item", "item.title != nil" -%}
+
+ {%- comment -%}
+ The values of `title` and `nav_order` can be numbers or strings.
+ Jekyll gives build failures when sorting on mixtures of different types,
+ so numbers and strings need to be sorted separately.
+
+ Here, numbers are sorted by their values, and come before all strings.
+ An omitted `nav_order` value is equivalent to the page's `title` value
+ (except that a numerical `title` value is treated as a string).
+
+ The case-sensitivity of string sorting is determined by `site.nav_sort`.
+ {%- endcomment -%}
+
+ {%- assign string_ordered_pages = titled_pages
+ | where_exp:"item", "item.nav_order == nil" -%}
+ {%- assign nav_ordered_pages = titled_pages
+ | where_exp:"item", "item.nav_order != nil" -%}
+
+ {%- comment -%}
+ The nav_ordered_pages have to be added to number_ordered_pages and
+ string_ordered_pages, depending on the nav_order value.
+ The first character of the jsonify result is `"` only for strings.
+ {%- endcomment -%}
+ {%- assign nav_ordered_groups = nav_ordered_pages
+ | group_by_exp:"item", "item.nav_order | jsonify | slice: 0" -%}
+ {%- assign number_ordered_pages = "" | split:"X" -%}
+ {%- for group in nav_ordered_groups -%}
+ {%- if group.name == '"' -%}
+ {%- assign string_ordered_pages = string_ordered_pages | concat: group.items -%}
+ {%- else -%}
+ {%- assign number_ordered_pages = number_ordered_pages | concat: group.items -%}
+ {%- endif -%}
+ {%- endfor -%}
+
+ {%- assign sorted_number_ordered_pages = number_ordered_pages | sort:"nav_order" -%}
+
+ {%- comment -%}
+ The string_ordered_pages have to be sorted by nav_order, and otherwise title
+ (where appending the empty string to a numeric title converts it to a string).
+ After grouping them by those values, the groups are sorted, then the items
+ of each group are concatenated.
+ {%- endcomment -%}
+ {%- assign string_ordered_groups = string_ordered_pages
+ | group_by_exp:"item", "item.nav_order | default: item.title | append:''" -%}
{%- 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" -%}
+ {%- assign sorted_string_ordered_groups = string_ordered_groups | sort_natural:"name" -%}
{%- else -%}
- {%- assign sorted_ordered_pages_list = ordered_pages_list | sort:"nav_order" -%}
- {%- assign sorted_unordered_pages_list = unordered_pages_list | sort:"title" -%}
+ {%- assign sorted_string_ordered_groups = string_ordered_groups | sort:"name" -%}
{%- endif -%}
- {%- assign pages_list = sorted_ordered_pages_list | concat: sorted_unordered_pages_list -%}
+ {%- assign sorted_string_ordered_pages = "" | split:"X" -%}
+ {%- for group in sorted_string_ordered_groups -%}
+ {%- assign sorted_string_ordered_pages = sorted_string_ordered_pages | concat: group.items -%}
+ {%- endfor -%}
+
+ {%- assign pages_list = sorted_number_ordered_pages | concat: sorted_string_ordered_pages -%}
+
{%- for node in pages_list -%}
- {%- unless node.nav_exclude -%}
- {%- if node.parent == nil and node.title -%}
- <li class="nav-list-item{% if page.url == node.url or page.parent == node.title or page.grand_parent == node.title %} active{% endif %}">
- {%- if page.parent == node.title or page.grand_parent == node.title -%}
- {%- assign first_level_url = node.url | absolute_url -%}
- {%- endif -%}
- {%- if node.has_children -%}
- <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
- {%- endif -%}
- <a href="{{ node.url | absolute_url }}" class="nav-list-link{% if page.url == node.url %} active{% endif %}">{{ node.title }}</a>
- {%- if node.has_children -%}
- {%- assign children_list = pages_list | where: "parent", node.title -%}
- <ul class="nav-list ">
- {%- for child in children_list -%}
- {%- unless child.nav_exclude -%}
- <li class="nav-list-item {% if page.url == child.url or page.parent == child.title %} active{% endif %}">
- {%- if page.url == child.url or page.parent == child.title -%}
- {%- assign second_level_url = child.url | absolute_url -%}
- {%- endif -%}
- {%- if child.has_children -%}
- <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
- {%- endif -%}
- <a href="{{ child.url | absolute_url }}" class="nav-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 | where: "grand_parent", node.title -%}
- <ul class="nav-list">
- {%- for grand_child in grand_children_list -%}
- <li class="nav-list-item {% if page.url == grand_child.url %} active{% endif %}">
- <a href="{{ grand_child.url | absolute_url }}" class="nav-list-link{% if page.url == grand_child.url %} active{% endif %}">{{ grand_child.title }}</a>
- </li>
- {%- endfor -%}
- </ul>
- {%- endif -%}
- </li>
- {%- endunless -%}
- {%- endfor -%}
- </ul>
- {%- endif -%}
- </li>
- {%- endif -%}
- {%- endunless -%}
+ {%- if node.parent == nil -%}
+ {%- unless node.nav_exclude -%}
+ <li class="nav-list-item{% if page.url == node.url or page.parent == node.title or page.grand_parent == node.title %} active{% endif %}">
+ {%- if node.has_children -%}
+ <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
+ {%- endif -%}
+ <a href="{{ node.url | absolute_url }}" class="nav-list-link{% if page.url == node.url %} active{% endif %}">{{ node.title }}</a>
+ {%- if node.has_children -%}
+ {%- assign children_list = pages_list | where: "parent", node.title -%}
+ <ul class="nav-list ">
+ {%- for child in children_list -%}
+ {%- unless child.nav_exclude -%}
+ <li class="nav-list-item {% if page.url == child.url or page.parent == child.title %} active{% endif %}">
+ {%- if child.has_children -%}
+ <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
+ {%- endif -%}
+ <a href="{{ child.url | absolute_url }}" class="nav-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 | where: "grand_parent", node.title -%}
+ <ul class="nav-list">
+ {%- for grand_child in grand_children_list -%}
+ {%- unless grand_child.nav_exclude -%}
+ <li class="nav-list-item {% if page.url == grand_child.url %} active{% endif %}">
+ <a href="{{ grand_child.url | absolute_url }}" class="nav-list-link{% if page.url == grand_child.url %} active{% endif %}">{{ grand_child.title }}</a>
+ </li>
+ {%- endunless -%}
+ {%- endfor -%}
+ </ul>
+ {%- endif -%}
+ </li>
+ {%- endunless -%}
+ {%- endfor -%}
+ </ul>
+ {%- endif -%}
+ </li>
+ {%- endunless -%}
+ {%- endif -%}
{%- endfor -%}
</ul>
diff --git a/_includes/vendor/anchor_headings.html b/_includes/vendor/anchor_headings.html
index 985f448bff00b3b527a21d7d8e127d9d529c1c72..e9ca8626c7d6e40152dcab41d9e21e79bdf0323d 100755
--- a/_includes/vendor/anchor_headings.html
+++ b/_includes/vendor/anchor_headings.html
@@ -1,18 +1,44 @@
{% capture headingsWorkspace %}
{% comment %}
- Version 1.0.3
+ Copyright (c) 2018 Vladimir "allejo" Jimenez
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ {% endcomment %}
+ {% comment %}
+ Version 1.0.7
https://github.com/allejo/jekyll-anchor-headings
"Be the pull request you wish to see in the world." ~Ben Balter
Usage:
- {% include anchor_headings.html html=content %}
+ {% include anchor_headings.html html=content anchorBody="#" %}
Parameters:
* html (string) - the HTML of compiled markdown generated by kramdown in Jekyll
Optional Parameters:
* beforeHeading (bool) : false - Set to true if the anchor should be placed _before_ the heading's content
+ * anchorAttrs (string) : '' - Any custom HTML attributes that will be added to the `<a>` tag; you may NOT use `href`, `class` or `title`;
+ the `%heading%` and `%html_id%` placeholders are available
* anchorBody (string) : '' - The content that will be placed inside the anchor; the `%heading%` placeholder is available
* anchorClass (string) : '' - The class(es) that will be used for each anchor. Separate multiple classes with a space
* anchorTitle (string) : '' - The `title` attribute that will be used for anchors
@@ -42,17 +68,22 @@
{% assign nextChar = node | replace: '"', '' | strip | slice: 0, 1 %}
{% assign headerLevel = nextChar | times: 1 %}
- <!-- If the level is cast to 0, it means it's not a h1-h6 tag, so let's try to fix it -->
+ <!-- If the level is cast to 0, it means it's not a h1-h6 tag, so let's see if we need to fix it -->
{% if headerLevel == 0 %}
- {% if nextChar != '<' and nextChar != '' %}
+ <!-- Split up the node based on closing angle brackets and get the first one. -->
+ {% assign firstChunk = node | split: '>' | first %}
+
+ <!-- If the first chunk does NOT contain a '<', that means we've broken another HTML tag that starts with 'h' -->
+ {% unless firstChunk contains '<' %}
{% capture node %}<h{{ node }}{% endcapture %}
- {% endif %}
+ {% endunless %}
{% capture edited_headings %}{{ edited_headings }}{{ node }}{% endcapture %}
{% continue %}
{% endif %}
- {% assign _workspace = node | split: '</h' %}
+ {% capture _closingTag %}</h{{ headerLevel }}>{% endcapture %}
+ {% assign _workspace = node | split: _closingTag %}
{% assign _idWorkspace = _workspace[0] | split: 'id="' %}
{% assign _idWorkspace = _idWorkspace[1] | split: '"' %}
{% assign html_id = _idWorkspace[0] %}
@@ -64,7 +95,7 @@
{% capture anchor %}{% endcapture %}
{% if html_id and headerLevel >= minHeader and headerLevel <= maxHeader %}
- {% capture anchor %}href="#{{ html_id}}" aria-labelledby="{{ html_id}}"{% endcapture %}
+ {% capture anchor %}href="#{{ html_id }}"{% endcapture %}
{% if include.anchorClass %}
{% capture anchor %}{{ anchor }} class="{{ include.anchorClass }}"{% endcapture %}
@@ -74,6 +105,10 @@
{% capture anchor %}{{ anchor }} title="{{ include.anchorTitle | replace: '%heading%', header }}"{% endcapture %}
{% endif %}
+ {% if include.anchorAttrs %}
+ {% capture anchor %}{{ anchor }} {{ include.anchorAttrs | replace: '%heading%', header | replace: '%html_id%', html_id }}{% endcapture %}
+ {% endif %}
+
{% capture anchor %}<a {{ anchor }}>{{ include.anchorBody | replace: '%heading%', header | default: '' }}</a>{% endcapture %}
<!-- In order to prevent adding extra space after a heading, we'll let the 'anchor' value contain it -->
@@ -93,8 +128,17 @@
{{ header }}{{ anchor }}
{% endif %}
{{ include.bodySuffix }}
- </h{{ _workspace | last }}
+ </h{{ headerLevel }}>
{% endcapture %}
+
+ <!--
+ If we have content after the `</hX>` tag, then we'll want to append that here so we don't lost any content.
+ -->
+ {% assign chunkCount = _workspace | size %}
+ {% if chunkCount > 1 %}
+ {% capture new_heading %}{{ new_heading }}{{ _workspace | last }}{% endcapture %}
+ {% endif %}
+
{% capture edited_headings %}{{ edited_headings }}{{ new_heading }}{% endcapture %}
{% endfor %}
{% endcapture %}{% assign headingsWorkspace = '' %}{{ edited_headings | strip }}
diff --git a/_layouts/default.html b/_layouts/default.html
index 1d41a7115a90ff3a234df067ec502dbbf7bef426..40d85ace46e5e2c9468f608877adef51988245f8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -48,10 +48,25 @@ layout: table_wrappers
</a>
</div>
<nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
- {% include nav.html %}
+ {% 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 %}
+ {% if collections_size > 1 %}
+ <div class="nav-category">{{ collection_value.name }}</div>
+ {% endif %}
+ {% include nav.html pages=collection %}
+ {% endif %}
+ {% endfor %}
+ {% else %}
+ {% include nav.html pages=site.html_pages %}
+ {% endif %}
</nav>
<footer class="site-footer">
- This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
+ This site uses <a href="https://github.com/just-the-docs/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
</footer>
</div>
<div class="main" id="top">
@@ -65,6 +80,7 @@ layout: table_wrappers
<div id="search-results" class="search-results"></div>
</div>
{% endif %}
+ {% include header_custom.html %}
{% if site.aux_links %}
<nav aria-label="Auxiliary" class="aux-nav">
<ul class="aux-nav-list">
@@ -86,6 +102,21 @@ layout: table_wrappers
<div id="main-content-wrap" class="main-content-wrap">
{% unless page.url == "/" %}
{% if page.parent %}
+ {%- for node in pages_list -%}
+ {%- if node.parent == nil -%}
+ {%- if page.parent == node.title or page.grand_parent == node.title -%}
+ {%- assign first_level_url = node.url | absolute_url -%}
+ {%- endif -%}
+ {%- if node.has_children -%}
+ {%- assign children_list = pages_list | where: "parent", node.title -%}
+ {%- for child in children_list -%}
+ {%- if page.url == child.url or page.parent == child.title -%}
+ {%- assign second_level_url = child.url | absolute_url -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
<nav aria-label="Breadcrumb" class="breadcrumb-nav">
<ol class="breadcrumb-nav-list">
{% if page.grand_parent %}
@@ -101,7 +132,7 @@ layout: table_wrappers
{% endunless %}
<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" %}
+ {% 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 %}
@@ -119,15 +150,17 @@ layout: table_wrappers
</ul>
{% endif %}
- {% if site.footer_content != nil or site.last_edit_timestamp or site.gh_edit_link %}
+ {% capture footer_custom %}
+ {%- include footer_custom.html -%}
+ {% endcapture %}
+ {% if footer_custom != "" or site.last_edit_timestamp or site.gh_edit_link %}
<hr>
<footer>
{% if site.back_to_top %}
<p><a href="#top" id="back-to-top">{{ site.back_to_top_text }}</a></p>
{% endif %}
- {% if site.footer_content != nil %}
- <p class="text-small text-grey-dk-000 mb-0">{{ site.footer_content }}</p>
- {% endif %}
+
+ {{ footer_custom }}
{% if site.last_edit_timestamp or site.gh_edit_link %}
<div class="d-flex mt-2">
@@ -144,7 +177,7 @@ layout: table_wrappers
site.gh_edit_view_mode
%}
<p class="text-small text-grey-dk-000 mb-0">
- <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
+ <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
</p>
{% endif %}
</div>
diff --git a/_sass/code.scss b/_sass/code.scss
index affc8aa42f432458e207dfec32f79146167a6c61..f0389129098de1ea5622fb02d752c367e908036c 100644
--- a/_sass/code.scss
+++ b/_sass/code.scss
@@ -11,23 +11,102 @@ code {
border-radius: $border-radius;
}
-pre.highlight,
-figure.highlight {
+// Avoid appearance of dark border around visited code links in Safari
+a:visited code {
+ border-color: $border-color;
+}
+
+// Content structure for highlighted code blocks using fences or Liquid
+//
+// ```[LANG]...```, no kramdown line_numbers:
+// div.[language-LANG.]highlighter-rouge > div.highlight > pre.highlight > code
+//
+// ```[LANG]...```, kramdown line_numbers = true:
+// div.[language-LANG.]highlighter-rouge > div.highlight > pre.highlight > code
+// > div.table-wrapper > table.rouge-table > tbody > tr
+// > td.rouge-gutter.gl > pre.lineno
+// | td.rouge-code > pre
+//
+// {% highlight LANG %}...{% endhighlight %}:
+// figure.highlight > pre > code.language-LANG
+//
+// {% highlight LANG linenos %}...{% endhighlight %}:
+// figure.highlight > pre > code.language-LANG
+// > div.table-wrapper > table.rouge-table > tbody > tr
+// > td.gutter.gl > pre.lineno
+// | td.code > pre
+//
+// fix_linenos removes the outermost pre when it encloses table.rouge-table
+//
+// See docs/index-test.md for some tests.
+//
+// No kramdown line_numbers: fences and Liquid highlighting look the same.
+// Kramdown line_numbers = true: fences have a wider gutter than with Liquid?
+
+// ```[LANG]...```
+div.highlighter-rouge {
padding: $sp-3;
margin-top: 0;
- margin-bottom: 0;
+ margin-bottom: $sp-3;
+ overflow-x: auto;
background-color: $code-background-color;
border-radius: $border-radius;
+ box-shadow: none;
-webkit-overflow-scrolling: touch;
+ div.highlight,
+ pre.highlight,
code {
padding: 0;
+ margin: 0;
border: 0;
}
}
-.highlighter-rouge {
+// {% highlight LANG %}...{% endhighlight %},
+// {% highlight LANG linenos %}...{% endhighlight %}:
+figure.highlight {
+ padding: $sp-3;
+ margin-top: 0;
margin-bottom: $sp-3;
+ background-color: $code-background-color;
+ border-radius: $border-radius;
+ box-shadow: none;
+ -webkit-overflow-scrolling: touch;
+
+ pre,
+ code {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ }
+}
+
+// ```[LANG]...```, kramdown line_numbers = true,
+// {% highlight LANG linenos %}...{% endhighlight %}:
+.highlight .table-wrapper {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ box-shadow: none;
+
+ td,
+ pre {
+ @include fs-2;
+ min-width: 0;
+ padding: 0;
+ background-color: $code-background-color;
+ border: 0;
+ }
+
+ td.gl {
+ padding-right: $sp-3;
+ }
+
+ pre {
+ margin: 0;
+ line-height: 2;
+ }
}
.highlight .c {
diff --git a/_sass/content.scss b/_sass/content.scss
index 113e7334900440b7e454f630d38d271f1c7c7d08..a53271ad814ac18b64da6e1e716fc145d37d172b 100644
--- a/_sass/content.scss
+++ b/_sass/content.scss
@@ -109,7 +109,7 @@
dl {
display: grid;
- grid-template-columns: max-content 1fr;
+ grid-template: auto / 10em 1fr;
}
dt,
@@ -118,16 +118,50 @@
}
dt {
+ grid-column: 1;
+ font-weight: 500;
text-align: right;
-
&::after {
content: ":";
}
}
dd {
+ grid-column: 2;
+ margin-bottom: 0;
margin-left: 1em;
- font-weight: 500;
+ blockquote,
+ div,
+ dl,
+ dt,
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6,
+ li,
+ ol,
+ p,
+ pre,
+ table,
+ ul,
+ .table-wrapper {
+ &:first-child {
+ margin-top: 0;
+ }
+ }
+ }
+
+ dd,
+ ol,
+ ul {
+ dl:first-child {
+ dt:first-child,
+ dd:nth-child(2) {
+ margin-top: 0;
+ }
+ }
}
.anchor-heading {
diff --git a/_sass/navigation.scss b/_sass/navigation.scss
index 0417b4c40d6c0b0c5cfbda16da8d89d8853c6116..521c15fa152a0973a5273f14c423b3328306ff30 100644
--- a/_sass/navigation.scss
+++ b/_sass/navigation.scss
@@ -131,6 +131,29 @@
}
}
+.nav-category {
+ padding-top: $sp-2;
+ padding-right: $gutter-spacing-sm;
+ padding-bottom: $sp-2;
+ padding-left: $gutter-spacing-sm;
+ font-weight: 600;
+ text-align: end;
+ text-transform: uppercase;
+ border-bottom: $border $border-color;
+ @include fs-2;
+
+ @include mq(md) {
+ padding-right: $gutter-spacing;
+ padding-left: $gutter-spacing;
+ margin-top: $gutter-spacing-sm;
+ text-align: start;
+
+ &:first-child {
+ margin-top: 0;
+ }
+ }
+}
+
// Aux nav
.aux-nav {
diff --git a/_sass/search.scss b/_sass/search.scss
index eb94cb71408bbd646734ae95cfdcc75ba14e38c2..4290210d021fe878a1b7da86176b388517e7cbcf 100644
--- a/_sass/search.scss
+++ b/_sass/search.scss
@@ -284,13 +284,13 @@
background-color: $search-background-color;
@include mq(md) {
- padding-left: #{$sp-4 * 1.25 + $sp-5};
+ padding-left: 2.3rem;
}
}
.search-label {
@include mq(md) {
- padding-left: #{$sp-4 * 1.25};
+ padding-left: 0.6rem;
}
}
diff --git a/_sass/support/_variables.scss b/_sass/support/_variables.scss
index b97b14e808b1ec8a8a21bba4a6c2dfbba535d597..3ab3f05e147ec2f5894ffaf1836cce263189839f 100644
--- a/_sass/support/_variables.scss
+++ b/_sass/support/_variables.scss
@@ -2,14 +2,32 @@
// Typography
//
-$body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue",
- helvetica, roboto, noto, "segoe ui", arial, sans-serif !default;
+$body-font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
+ Roboto, "Helvetica Neue", Arial, sans-serif !default;
$mono-font-family: "SFMono-Regular", Menlo, Consolas, Monospace !default;
$root-font-size: 16px !default; // Base font-size for rems
$body-line-height: 1.4 !default;
$content-line-height: 1.6 !default;
$body-heading-line-height: 1.25 !default;
+//
+// Font size
+// `-sm` suffix is the size at the small (and above) media query
+//
+
+$font-size-1: 9px !default;
+$font-size-1-sm: 10px !default;
+$font-size-2: 11px !default; //h4 - uppercased!, h6 not uppercased, text-small
+$font-size-3: 12px !default; //h5
+$font-size-4: 14px !default;
+$font-size-5: 16px !default; //h3
+$font-size-6: 18px !default; //h2
+$font-size-7: 24px !default;
+$font-size-8: 32px !default; //h1
+$font-size-9: 36px !default;
+$font-size-10: 42px !default;
+$font-size-10-sm: 48px !default;
+
//
// Colors
//
diff --git a/_sass/support/mixins/_typography.scss b/_sass/support/mixins/_typography.scss
index 1718a932f575bfa81f44b6c419ceda443f4f01e2..5207fcd13ac46ff818f870c00dedf647bfc4d206 100644
--- a/_sass/support/mixins/_typography.scss
+++ b/_sass/support/mixins/_typography.scss
@@ -1,86 +1,84 @@
-// Font size
-
@mixin fs-1 {
- font-size: 9px !important;
+ font-size: $font-size-1 !important;
@include mq(sm) {
- font-size: 10px !important;
+ font-size: $font-size-1-sm !important;
}
}
@mixin fs-2 {
- font-size: 11px !important;
+ font-size: $font-size-2 !important;
@include mq(sm) {
- font-size: 12px !important;
+ font-size: $font-size-3 !important;
}
}
@mixin fs-3 {
- font-size: 12px !important;
+ font-size: $font-size-3 !important;
@include mq(sm) {
- font-size: 14px !important;
+ font-size: $font-size-4 !important;
}
}
@mixin fs-4 {
- font-size: 15px !important;
+ font-size: $font-size-4 !important;
@include mq(sm) {
- font-size: 16px !important;
+ font-size: $font-size-5 !important;
}
}
@mixin fs-5 {
- font-size: 16px !important;
+ font-size: $font-size-5 !important;
@include mq(sm) {
- font-size: 18px !important;
+ font-size: $font-size-6 !important;
}
}
@mixin fs-6 {
- font-size: 18px !important;
+ font-size: $font-size-6 !important;
@include mq(sm) {
- font-size: 24px !important;
+ font-size: $font-size-7 !important;
line-height: $body-heading-line-height;
}
}
@mixin fs-7 {
- font-size: 24px !important;
+ font-size: $font-size-7 !important;
line-height: $body-heading-line-height;
@include mq(sm) {
- font-size: 32px !important;
+ font-size: $font-size-8 !important;
}
}
@mixin fs-8 {
- font-size: 32px !important;
+ font-size: $font-size-8 !important;
line-height: $body-heading-line-height;
@include mq(sm) {
- font-size: 36px !important;
+ font-size: $font-size-9 !important;
}
}
@mixin fs-9 {
- font-size: 36px !important;
+ font-size: $font-size-9 !important;
line-height: $body-heading-line-height;
@include mq(sm) {
- font-size: 42px !important;
+ font-size: $font-size-10 !important;
}
}
@mixin fs-10 {
- font-size: 42px !important;
+ font-size: $font-size-10 !important;
line-height: $body-heading-line-height;
@include mq(sm) {
- font-size: 48px !important;
+ font-size: $font-size-10-sm !important;
}
}
diff --git a/_sass/typography.scss b/_sass/typography.scss
index 3749d43b334e0efc8c5f606a006f4e9f4a6fc968..cadee362dcfd8da77fc9b5cbdccb93283cc83d3b 100644
--- a/_sass/typography.scss
+++ b/_sass/typography.scss
@@ -27,6 +27,10 @@ h4,
letter-spacing: 0.1em;
}
+h4 code {
+ text-transform: none;
+}
+
h5,
.text-epsilon {
@include fs-3;
diff --git a/_sass/vendor/normalize.scss/README.md b/_sass/vendor/normalize.scss/README.md
index 36cc1c6a75654391d45069bc20484bfa8724c197..7af1714a9fd259e0f08ef4f766d46ccfd67081d9 100644
--- a/_sass/vendor/normalize.scss/README.md
+++ b/_sass/vendor/normalize.scss/README.md
@@ -1,78 +1,7 @@
-# normalize.scss v0.1.0
+# normalize.scss
-Normalize.scss is the SCSS version of [normalize.css](http://necolas.github.io/normalize.css), a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards.
+Normalize.scss is an SCSS copy of [normalize.css](http://necolas.github.io/normalize.css), a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards.
-[View the normalize.css test file](http://necolas.github.io/normalize.css/latest/test.html)
-
-## Install
-
-* [npm](http://npmjs.org/): `npm install --save normalize.scss`
-* [Component(1)](https://github.com/component/component/): `component install guerrero/normalize.scss`
-* [Bower](http://bower.io/): `bower install --save normalize.scss`
-* Download: Go to [this link](https://raw.githubusercontent.com/guerrero/normalize.scss/master/normalize.scss), press right-click on the page and choose "Save as..."
-
-No other styles should come before Normalize.scss.
-
-It's recommendable to modify `normalize.scss` to suit it to your project
-
-## What does it do?
-
-* Preserves useful defaults, unlike many CSS resets.
-* Normalizes styles for a wide range of elements.
-* Corrects bugs and common browser inconsistencies.
-* Improves usability with subtle improvements.
-* Explains what code does using detailed comments.
-
-## Browser support
-
-* Google Chrome (latest)
-* Mozilla Firefox (latest)
-* Mozilla Firefox 4
-* Opera (latest)
-* Apple Safari 6+
-* Internet Explorer 8+
-
-[Normalize.css v1 provides legacy browser
-support](https://github.com/necolas/normalize.css/tree/v1) (IE 6+, Safari 4+),
-but is no longer actively developed.
-
-## Extended details
-
-Additional detail and explanation of the esoteric parts of normalize.css.
+The [normalize.scss fork](https://github.com/guerrero/normalize.scss) of [normalize.css](http://necolas.github.io/normalize.css) was archived in 2014, and has not been updated since v0.1.0.
-#### `pre, code, kbd, samp`
-
-The `font-family: monospace, monospace` hack fixes the inheritance and scaling
-of font-size for preformated text. The duplication of `monospace` is
-intentional. [Source](http://en.wikipedia.org/wiki/User:Davidgothberg/Test59).
-
-#### `sub, sup`
-
-Normally, using `sub` or `sup` affects the line-box height of text in all
-browsers. [Source](http://gist.github.com/413930).
-
-#### `svg:not(:root)`
-
-Adding `overflow: hidden` fixes IE9's SVG rendering. Earlier versions of IE
-don't support SVG, so we can safely use the `:not()` and `:root` selectors that
-modern browsers use in the default UA stylesheets to apply this style. [SVG
-Mailing List discussion](http://lists.w3.org/Archives/Public/public-svg-wg/2008JulSep/0339.html)
-
-#### `input[type="search"]`
-
-The search input is not fully stylable by default. In Chrome and Safari on
-OSX/iOS you can't control `font`, `padding`, `border`, or `background`. In
-Chrome and Safari on Windows you can't control `border` properly. It will apply
-`border-width` but will only show a border color (which cannot be controlled)
-for the outer 1px of that border. Applying `-webkit-appearance: textfield`
-addresses these issues without removing the benefits of search inputs (e.g.
-showing past searches).
-
-#### `legend`
-
-Adding `border: 0` corrects an IE 8–11 bug where `color` (yes, `color`) is not
-inherited by `legend`.
-
-## Acknowledgements
-
-Normalize.scss is a project by [Alex Guerrero](https://github.com/guerrero) based on [normalize.css](http://necolas.github.io/normalize.css) from [Nicolas Gallagher](https://github.com/necolas), co-created with [Jonathan Neal](https://github.com/jonathantneal).
+[View the normalize.css test file](http://necolas.github.io/normalize.css/latest/test.html)
diff --git a/_sass/vendor/normalize.scss/normalize.scss b/_sass/vendor/normalize.scss/normalize.scss
index ce38a4fab48eca67614579fdd6d6903749c8c0cb..192eb9ce43389039996bc2e9344c5bb14b730d72 100644
--- a/_sass/vendor/normalize.scss/normalize.scss
+++ b/_sass/vendor/normalize.scss/normalize.scss
@@ -1,89 +1,76 @@
-/*! normalize.scss v0.1.0 | MIT License | based on git.io/normalize */
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+ ========================================================================== */
/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- * user zoom.
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
- font-family: sans-serif; /* 1 */
- -ms-text-size-adjust: 100%; /* 2 */
+ line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
+/* Sections
+ ========================================================================== */
+
/**
- * Remove default margin.
+ * Remove the margin in all browsers.
*/
body {
margin: 0;
}
-/* HTML5 display definitions
- ========================================================================== */
-
/**
- * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11
- * and Firefox.
- * Correct `block` display not defined for `main` in IE 11.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
+ * Render the `main` element consistently in IE.
+ */
+
+main {
display: block;
}
/**
- * 1. Correct `inline-block` display not defined in IE 8/9.
- * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
*/
-audio,
-canvas,
-progress,
-video {
- display: inline-block; /* 1 */
- vertical-align: baseline; /* 2 */
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
}
+/* Grouping content
+ ========================================================================== */
+
/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
*/
-audio:not([controls]) {
- display: none;
- height: 0;
+hr {
+ box-sizing: content-box; /* 1 */
+ height: 0; /* 1 */
+ overflow: visible; /* 2 */
}
/**
- * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
*/
-[hidden],
-template {
- display: none;
+pre {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
}
-/* Links
+/* Text-level semantics
========================================================================== */
/**
- * Remove the gray background color from active links in IE 10.
+ * Remove the gray background on active links in IE 10.
*/
a {
@@ -91,63 +78,39 @@ a {
}
/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
- outline: 0;
-}
-
-/* Text-level semantics
- ========================================================================== */
-
-/**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
- border-bottom: 1px dotted;
+ border-bottom: none; /* 1 */
+ text-decoration: underline; /* 2 */
+ text-decoration: underline dotted; /* 2 */
}
/**
- * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ * Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
- font-weight: bold;
-}
-
-/**
- * Address styling not present in Safari and Chrome.
- */
-
-dfn {
- font-style: italic;
-}
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari, and Chrome.
- */
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
+ font-weight: bolder;
}
/**
- * Address styling not present in IE 8/9.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
*/
-mark {
- background: #ff0;
- color: #000;
+code,
+kbd,
+samp {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
}
/**
- * Address inconsistent and variable font size in all browsers.
+ * Add the correct font size in all browsers.
*/
small {
@@ -155,7 +118,8 @@ small {
}
/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
*/
sub,
@@ -166,262 +130,220 @@ sup {
vertical-align: baseline;
}
-sup {
- top: -0.5em;
-}
-
sub {
bottom: -0.25em;
}
+sup {
+ top: -0.5em;
+}
+
/* Embedded content
========================================================================== */
/**
- * Remove border when inside `a` element in IE 8/9/10.
+ * Remove the border on images inside links in IE 10.
*/
img {
- border: 0;
-}
-
-/**
- * Correct overflow not hidden in IE 9/10/11.
- */
-
-svg:not(:root) {
- overflow: hidden;
+ border-style: none;
}
-/* Grouping content
+/* Forms
========================================================================== */
/**
- * Address margin not present in IE 8/9 and Safari.
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
*/
-figure {
- margin: 1em 40px;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- height: 0;
+button,
+input,
+optgroup,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 1 */
+ line-height: 1.15; /* 1 */
+ margin: 0; /* 2 */
}
/**
- * Contain overflow in all browsers.
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
*/
-pre {
- overflow: auto;
+button,
+input { /* 1 */
+ overflow: visible;
}
/**
- * Address odd `em`-unit font size rendering in all browsers.
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
*/
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, monospace;
- font-size: 1em;
+button,
+select { /* 1 */
+ text-transform: none;
}
-/* Forms
- ========================================================================== */
-
-/**
- * Known limitation: by default, Chrome and Safari on OS X allow very limited
- * styling of `select`, unless a `border` property is set.
- */
-
/**
- * 1. Correct color not being inherited.
- * Known issue: affects color of disabled elements.
- * 2. Correct font properties not being inherited.
- * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ * Correct the inability to style clickable types in iOS and Safari.
*/
button,
-input,
-optgroup,
-select,
-textarea {
- color: inherit; /* 1 */
- font: inherit; /* 2 */
- margin: 0; /* 3 */
+[type="button"],
+[type="reset"],
+[type="submit"] {
+ -webkit-appearance: button;
}
/**
- * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ * Remove the inner border and padding in Firefox.
*/
-button {
- overflow: visible;
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
}
/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
- * Correct `select` style inheritance in Firefox.
+ * Restore the focus styles unset by the previous rule.
*/
-button,
-select {
- text-transform: none;
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+ outline: 1px dotted ButtonText;
}
/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- * and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- * `input` and others.
+ * Correct the padding in Firefox.
*/
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
- -webkit-appearance: button; /* 2 */
- cursor: pointer; /* 3 */
+fieldset {
+ padding: 0.35em 0.75em 0.625em;
}
/**
- * Re-set default cursor for disabled elements.
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ * `fieldset` elements in all browsers.
*/
-button[disabled],
-html input[disabled] {
- cursor: default;
+legend {
+ box-sizing: border-box; /* 1 */
+ color: inherit; /* 2 */
+ display: table; /* 1 */
+ max-width: 100%; /* 1 */
+ padding: 0; /* 3 */
+ white-space: normal; /* 1 */
}
/**
- * Remove inner padding and border in Firefox 4+.
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- border: 0;
- padding: 0;
+progress {
+ vertical-align: baseline;
}
/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
+ * Remove the default vertical scrollbar in IE 10+.
*/
-input {
- line-height: normal;
+textarea {
+ overflow: auto;
}
/**
- * It's recommended that you don't attempt to style these elements.
- * Firefox's implementation doesn't respect box-sizing, padding, or width.
- *
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
*/
-input[type="checkbox"],
-input[type="radio"] {
+[type="checkbox"],
+[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
- * Fix the cursor style for Chrome's increment/decrement buttons. For certain
- * `font-size` values of the `input`, it causes the cursor style of the
- * decrement button to change from `default` to `text`.
+ * Correct the cursor style of increment and decrement buttons in Chrome.
*/
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
- * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
- * (include `-moz` to future-proof).
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
*/
-input[type="search"] {
+[type="search"] {
-webkit-appearance: textfield; /* 1 */
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box; /* 2 */
- box-sizing: content-box;
+ outline-offset: -2px; /* 2 */
}
/**
- * Remove inner padding and search cancel button in Safari and Chrome on OS X.
- * Safari (but not Chrome) clips the cancel button when the search input has
- * padding (and `textfield` appearance).
+ * Remove the inner padding in Chrome and Safari on macOS.
*/
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
+[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
- * Define consistent border, margin, and padding.
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
*/
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
+::-webkit-file-upload-button {
+ -webkit-appearance: button; /* 1 */
+ font: inherit; /* 2 */
}
-/**
- * 1. Correct `color` not being inherited in IE 8/9/10/11.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
- border: 0; /* 1 */
- padding: 0; /* 2 */
-}
+/* Interactive
+ ========================================================================== */
-/**
- * Remove default vertical scrollbar in IE 8/9/10/11.
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
*/
-textarea {
- overflow: auto;
+details {
+ display: block;
}
-/**
- * Don't inherit the `font-weight` (applied by a rule above).
- * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+/*
+ * Add the correct display in all browsers.
*/
-optgroup {
- font-weight: bold;
+summary {
+ display: list-item;
}
-/* Tables
+/* Misc
========================================================================== */
/**
- * Remove most spacing between table cells.
+ * Add the correct display in IE 10+.
*/
-table {
- border-collapse: collapse;
- border-spacing: 0;
+template {
+ display: none;
}
-td,
-th {
- padding: 0;
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+ display: none;
}
diff --git a/_sass/vendor/normalize.scss/package.json b/_sass/vendor/normalize.scss/package.json
deleted file mode 100644
index 2d051c2767528f5d2b8ee5714a991e9ddbda5f5a..0000000000000000000000000000000000000000
--- a/_sass/vendor/normalize.scss/package.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "_args": [
- [
- "normalize.scss",
- "/Users/pmarsceill/_projects/just-the-docs"
- ]
- ],
- "_from": "normalize.scss@*",
- "_id": "normalize.scss@0.1.0",
- "_inCache": true,
- "_installable": true,
- "_location": "/normalize.scss",
- "_nodeVersion": "0.10.32",
- "_npmUser": {
- "email": "alexguerrero1092@gmail.com",
- "name": "alexguerrero"
- },
- "_npmVersion": "2.0.2",
- "_phantomChildren": {},
- "_requested": {
- "name": "normalize.scss",
- "raw": "normalize.scss",
- "rawSpec": "",
- "scope": null,
- "spec": "*",
- "type": "range"
- },
- "_requiredBy": [
- "#DEV:/"
- ],
- "_resolved": "https://registry.npmjs.org/normalize.scss/-/normalize.scss-0.1.0.tgz",
- "_shasum": "4a21dc25bd4c019c857785f829b658aba2a8f9ab",
- "_shrinkwrap": null,
- "_spec": "normalize.scss",
- "_where": "/Users/pmarsceill/_projects/just-the-docs",
- "author": "",
- "bugs": {
- "url": "https://github.com/guerrero/normalize.scss/issues"
- },
- "dependencies": {},
- "description": "Normalize.scss as a node packaged module",
- "devDependencies": {},
- "directories": {},
- "dist": {
- "shasum": "4a21dc25bd4c019c857785f829b658aba2a8f9ab",
- "tarball": "https://registry.npmjs.org/normalize.scss/-/normalize.scss-0.1.0.tgz"
- },
- "files": [
- "normalize.scss"
- ],
- "gitHead": "d67d517e28615a873066438af1d4845c157c9baf",
- "homepage": "https://github.com/guerrero/normalize.scss",
- "license": "MIT",
- "maintainers": [
- {
- "name": "alexguerrero",
- "email": "alexguerrero1092@gmail.com"
- }
- ],
- "name": "normalize.scss",
- "optionalDependencies": {},
- "readme": "ERROR: No README data found!",
- "repository": {
- "type": "git",
- "url": "git://github.com/guerrero/normalize.scss.git"
- },
- "scripts": {},
- "style": "normalize.scss",
- "version": "0.1.0"
-}
diff --git a/assets/js/zzzz-search-data.json b/assets/js/zzzz-search-data.json
index 0a6c3e5c89046ea68923a53cec7d7f5e7b2794fe..6235244d31dbe00641446e906bdf5d38ded9c9fa 100644
--- a/assets/js/zzzz-search-data.json
+++ b/assets/js/zzzz-search-data.json
@@ -2,8 +2,21 @@
permalink: /assets/js/search-data.json
---
{
- {%- assign i = 0 -%}
- {% for page in site.html_pages %}
+{%- assign i = 0 -%}
+{%- assign pages_array = '' | split: '' -%}
+{%- assign pages_array = pages_array | push: site.html_pages -%}
+{%- if site.just_the_docs.collections -%}
+ {%- 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.search_exclude != true -%}
+ {%- assign pages_array = pages_array | push: collection -%}
+ {%- endif -%}
+ {%- endfor -%}
+{%- endif -%}
+{%- for pages in pages_array -%}
+ {%- for page in pages -%}
{%- if page.title and page.search_exclude != true -%}
{%- assign page_content = page.content -%}
{%- assign heading_level = site.search.heading_level | default: 2 -%}
@@ -14,7 +27,7 @@ permalink: /assets/js/search-data.json
{%- endfor -%}
{%- assign parts = page_content | split: '<h1' -%}
{%- assign title_found = false -%}
- {% for part in parts offset: 1 %}
+ {%- for part in parts offset: 1 -%}
{%- assign titleAndContent = part | split: '</h1>' -%}
{%- assign title = titleAndContent[0] | replace_first: '>', '<h1>' | split: '<h1>' -%}
{%- assign title = title[1] | strip_html -%}
@@ -54,5 +67,6 @@ permalink: /assets/js/search-data.json
{%- assign i = i | plus: 1 -%}
{%- endunless -%}
{%- endif -%}
- {% endfor %}
+ {%- endfor -%}
+{%- endfor %}
}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..576c7ed3620ad8c71e2e360fe64145f69458b64e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3.5"
+
+services:
+ jekyll:
+ build:
+ context: ./
+ ports:
+ - 4000:4000
+ volumes:
+ - .:/usr/src/app
+ stdin_open: true
+ tty: true
+ command: bundle exec jekyll serve -H 0.0.0.0 -t
+
diff --git a/docs/configuration.md b/docs/configuration.md
index 65471d23c75d7e5d2d4d8d69b86ad72f2c5fc325..b11f448fe0c462aa707ce181ea42071e68f13b9a 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -7,8 +7,7 @@ nav_order: 2
# Configuration
{: .no_toc }
-
-Just the Docs has some specific configuration parameters that can be defined in your Jekyll site's _config.yml file.
+Just the Docs has some specific configuration parameters that can be defined in your Jekyll site's \_config.yml file.
{: .fs-6 .fw-300 }
## Table of contents
@@ -19,8 +18,7 @@ Just the Docs has some specific configuration parameters that can be defined in
---
-
-View this site's [_config.yml](https://github.com/pmarsceill/just-the-docs/tree/master/_config.yml) file as an example.
+View this site's [\_config.yml](https://github.com/just-the-docs/just-the-docs/tree/main/_config.yml) file as an example.
## Site logo
@@ -67,7 +65,7 @@ search:
# Aux links for the upper right navigation
aux_links:
"Just the Docs on GitHub":
- - "//github.com/pmarsceill/just-the-docs"
+ - "//github.com/just-the-docs/just-the-docs"
# Makes Aux links open in a new tab. Default is false
aux_links_new_tab: false
@@ -86,9 +84,11 @@ heading_anchors: true
## Footer content
```yaml
-# Footer content
+# Footer content
# appears at the bottom of every page's main content
-footer_content: "Copyright © 2017-2019 Patrick Marsceill. Distributed by an <a href=\"https://github.com/pmarsceill/just-the-docs/tree/master/LICENSE.txt\">MIT license.</a>"
+# Note: The footer_content option is deprecated and will be removed in a future major release. Please use `_includes/footer_custom.html` for more robust
+markup / liquid-based content.
+footer_content: "Copyright © 2017-2020 Patrick Marsceill. Distributed by an <a href=\"https://github.com/just-the-docs/just-the-docs/tree/main/LICENSE.txt\">MIT license.</a>"
# Footer last edited timestamp
last_edit_timestamp: true # show or hide edit time - page must have `last_modified_date` defined in the frontmatter
@@ -97,15 +97,19 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" # uses ruby's time format: https:/
# Footer "Edit this page on GitHub" link text
gh_edit_link: true # show or hide edit this page link
gh_edit_link_text: "Edit this page on GitHub."
-gh_edit_repository: "https://github.com/pmarsceill/just-the-docs" # the github URL for your repo
-gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_repository: "https://github.com/just-the-docs/just-the-docs" # the github URL for your repo
+gh_edit_branch: "main" # the branch that your docs is served from
+# gh_edit_source: docs # the source that your files originate from
gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately
```
+_note: `footer_content` is deprecated, but still supported. For a better experience we have moved this into an include called `_includes/footer_custom.html` which will allow for robust markup / liquid-based content._
+
- the "page last modified" data will only display if a page has a key called `last_modified_date`, formatted in some readable date format
- `last_edit_time_format` uses Ruby's DateTime formatter; see examples and more information [at this link.](https://apidock.com/ruby/DateTime/strftime)
- `gh_edit_repository` is the URL of the project's GitHub repository
-- `gh_edit_branch` is the branch that the docs site is served from; defaults to `master`
+- `gh_edit_branch` is the branch that the docs site is served from; defaults to `main`
+- `gh_edit_source` is the source directory that your project files are stored in (should be the same as [site.source](https://jekyllrb.com/docs/configuration/options/))
- `gh_edit_view_mode` is `"tree"` by default, which brings the user to the github page; switch to `"edit"` to bring the user directly into editing mode
## Color scheme
@@ -114,6 +118,7 @@ gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into t
# Color scheme supports "light" (default) and "dark"
color_scheme: dark
```
+
<button class="btn js-toggle-dark-mode">Preview dark color scheme</button>
<script>
@@ -140,3 +145,53 @@ See [Customization]({{ site.baseurl }}{% link docs/customization.md %}) for more
ga_tracking: UA-5555555-55
ga_tracking_anonymize_ip: true # Use GDPR compliant Google Analytics settings (true by default)
```
+
+## Document collections
+
+By default, the navigation and search include normal [pages](https://jekyllrb.com/docs/pages/).
+Instead, you can also use [Jekyll collections](https://jekyllrb.com/docs/collections/) which group documents semantically together.
+
+For example, put all your documentation files in the `_docs` folder and create the `docs` collection:
+
+```yaml
+# Define Jekyll collections
+collections:
+ # Define a collection named "docs", its documents reside in the "_docs" directory
+ docs:
+ permalink: "/:collection/:path/"
+ output: true
+
+just_the_docs:
+ # Define which collections are used in just-the-docs
+ collections:
+ # Reference the "docs" collection
+ docs:
+ # Give the collection a name
+ name: Documentation
+ # Exclude the collection from the navigation
+ # Supports true or false (default)
+ nav_exclude: false
+ # Exclude the collection from the search
+ # Supports true or false (default)
+ search_exclude: false
+```
+
+You can reference multiple collections.
+This creates categories in the navigation with the configured names.
+
+```yaml
+collections:
+ docs:
+ permalink: "/:collection/:path/"
+ output: true
+ tutorials:
+ permalink: "/:collection/:path/"
+ output: true
+
+just_the_docs:
+ collections:
+ docs:
+ name: Documentation
+ tutorials:
+ name: Tutorials
+```
diff --git a/docs/customization.md b/docs/customization.md
index cbcd38cc1c1350e95573be81ac1ec5384aa8bc1a..075e30d9a957ea43df1b051a806fd2de99d71e73 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -16,6 +16,7 @@ nav_order: 6
---
## Color schemes
+
{: .d-inline-block }
New
@@ -32,6 +33,7 @@ To enable a color scheme, set the `color_scheme` parameter in your site's `_conf
# Color scheme supports "light" (default) and "dark"
color_scheme: dark
```
+
<button class="btn js-toggle-dark-mode">Preview dark color scheme</button>
<script>
@@ -53,10 +55,10 @@ jtd.addEvent(toggleDarkMode, 'click', function(){
### Define a custom scheme
You can add custom schemes.
-If you want to add a scheme named `foo` (can be any name) just add a file `_sass/color_schemes/foo.scss` (replace `foo` by your scheme name)
+If you want to add a scheme named `foo` (can be any name) just add a file `_sass/color_schemes/foo.scss` (replace `foo` by your scheme name)
where you override theme variables to change colors, fonts, spacing, etc.
-Available variables are listed in the [_variables.scss](https://github.com/pmarsceill/just-the-docs/tree/master/_sass/support/_variables.scss) file.
+Available variables are listed in the [\_variables.scss](https://github.com/just-the-docs/just-the-docs/tree/main/_sass/support/_variables.scss) file.
For example, to change the link color from the purple default to blue, include the following inside your scheme file:
@@ -73,6 +75,7 @@ Please use scheme files.
### Use a custom scheme
To use the custom color scheme, only set the `color_scheme` parameter in your site's `_config.yml` file:
+
```yaml
color_scheme: foo
```
@@ -80,7 +83,7 @@ color_scheme: foo
### Switchable custom scheme
If you want to be able to change the scheme dynamically, for example via javascript, just add a file `assets/css/just-the-docs-foo.scss` (replace `foo` by your scheme name)
-with the following content:`
+with the following content:
{% raw %}
---
@@ -91,7 +94,7 @@ with the following content:`
This allows you to switch the scheme via the following javascript.
```js
-jtd.setTheme('foo');
+jtd.setTheme("foo")
```
## Override and completely custom styles
@@ -109,7 +112,13 @@ For example, if you'd like to add your own styles for printing a page, you could
```scss
// Print-only styles.
@media print {
- .side-bar, .page-header { display: none; }
- .main-content { max-width: auto; margin: 1em;}
+ .side-bar,
+ .page-header {
+ display: none;
+ }
+ .main-content {
+ max-width: auto;
+ margin: 1em;
+ }
}
```
diff --git a/docs/index-test.md b/docs/index-test.md
index ccdeb4b23f8d2fa581113291f222f0d253db9a0b..76319b0d663a5dc5cb23db7d2963526ef5e7f67a 100644
--- a/docs/index-test.md
+++ b/docs/index-test.md
@@ -39,7 +39,7 @@ GitHubPages::Dependencies.gems.each do |gem, version|
end
```
-#### [](#header-4)Header 4
+#### [](#header-4)Header 4 `with code not transformed`
* This is an unordered list following a header.
* This is an unordered list following a header.
@@ -140,6 +140,37 @@ end
<dd>Green</dd>
</dl>
+#### Multiple description terms and values
+
+Term
+: Brief description of Term
+
+Longer Term
+: Longer description of Term,
+ possibly more than one line
+
+Term
+: First description of Term,
+ possibly more than one line
+
+: Second description of Term,
+ possibly more than one line
+
+Term1
+Term2
+: Single description of Term1 and Term2,
+ possibly more than one line
+
+Term1
+Term2
+: First description of Term1 and Term2,
+ possibly more than one line
+
+: Second description of Term1 and Term2,
+ possibly more than one line
+
+### More code
+
```
Long, single-line code blocks should not wrap. They should horizontally scroll if they are too long. This line should be long enough to demonstrate this.
```
diff --git a/docs/navigation-structure.md b/docs/navigation-structure.md
index d5a75041f5dd8f179f316a183ef043bc990f6b54..535a2e0ee7daa606b1b1774b03bfa8f9887791a4 100644
--- a/docs/navigation-structure.md
+++ b/docs/navigation-structure.md
@@ -5,13 +5,17 @@ nav_order: 5
---
# Navigation Structure
-{: .no_toc }
-## Table of contents
-{: .no_toc .text-delta }
+{: .no_toc }
+<details open markdown="block">
+ <summary>
+ Table of contents
+ </summary>
+ {: .text-delta }
1. TOC
{:toc}
+</details>
---
@@ -25,9 +29,10 @@ By default, all pages will appear as top level pages in the main nav unless a pa
## Ordering pages
-To specify a page order, use the `nav_order` parameter in your pages' YAML front matter.
+To specify a page order, you can use the `nav_order` parameter in your pages' YAML front matter.
#### Example
+
{: .no_toc }
```yaml
@@ -36,14 +41,16 @@ layout: default
title: Customization
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.
-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`).
+The parameter values determine the order of the top-level pages, and of child pages with the same parent. You can reuse the same parameter values (e.g., integers starting from 1) for the child pages of different parents.
+
+The parameter values can be numbers (integers, floats) and/or strings. When you omit `nav_order` parameters, they default to the titles of the pages, which are ordered alphabetically. Pages with numerical `nav_order` parameters always come before those with strings or default `nav_order` parameters. If you want to make the page order independent of the page titles, you can set explicit `nav_order` parameters on all pages.
+
+By default, all Capital letters come before all lowercase letters; you can add `nav_sort: case_insensitive` in the configuration file to ignore the case. Enclosing strings in quotation marks is optional.
+
+> _Note for users of previous versions:_ `nav_sort: case_insensitive` previously affected the ordering of numerical `nav_order` parameters: e.g., `10` came before `2`. Also, all pages with explicit `nav_order` parameters previously came before all pages with default parameters. Both were potentially confusing, and they have now been eliminated.
---
@@ -52,6 +59,7 @@ when sorting strings (but also sorts numbers lexicographically: `10` comes befor
For specific pages that you do not wish to include in the main navigation, e.g. a 404 page or a landing page, use the `nav_exclude: true` parameter in the YAML front matter for that page.
#### Example
+
{: .no_toc }
```yaml
@@ -60,8 +68,13 @@ layout: default
title: 404
nav_exclude: true
---
+
```
+The `nav_exclude` parameter does not affect the [auto-generating list of child pages](#auto-generating-table-of-contents), which you can use to access pages excluded from the main navigation.
+
+Pages with no `title` are automatically excluded from the navigation.
+
---
## Pages with children
@@ -96,9 +109,11 @@ Sometimes you will want to create a page with many children (a section). First,
```
On the parent pages, add this YAML front matter parameter:
-- `has_children: true` (tells us that this is a parent page)
+
+- `has_children: true` (tells us that this is a parent page)
#### Example
+
{: .no_toc }
```yaml
@@ -108,16 +123,19 @@ title: UI Components
nav_order: 2
has_children: true
---
+
```
Here we're setting up the UI Components landing page that is available at `/docs/ui-components`, which has children and is ordered second in the main nav.
### Child pages
+
{: .text-gamma }
On child pages, simply set the `parent:` YAML front matter to whatever the parent's page title is and set a nav order (this number is now scoped within the section).
#### Example
+
{: .no_toc }
```yaml
@@ -127,6 +145,7 @@ title: Buttons
parent: UI Components
nav_order: 2
---
+
```
The Buttons page appears as a child of UI Components and appears second in the UI Components section.
@@ -136,6 +155,7 @@ The Buttons page appears as a child of UI Components and appears second in the U
By default, all pages with children will automatically append a Table of Contents which lists the child pages after the parent page's content. To disable this auto Table of Contents, set `has_toc: false` in the parent page's YAML front matter.
#### Example
+
{: .no_toc }
```yaml
@@ -146,9 +166,11 @@ nav_order: 2
has_children: true
has_toc: false
---
+
```
### Children with children
+
{: .text-gamma }
Child pages can also have children (grandchildren). This is achieved by using a similar pattern on the child and grandchild pages.
@@ -157,6 +179,7 @@ Child pages can also have children (grandchildren). This is achieved by using a
1. Add the `parent` and `grand_parent` attribute to the grandchild
#### Example
+
{: .no_toc }
```yaml
@@ -167,6 +190,7 @@ parent: UI Components
nav_order: 2
has_children: true
---
+
```
```yaml
@@ -177,6 +201,7 @@ parent: Buttons
grand_parent: UI Components
nav_order: 1
---
+
```
This would create the following navigation structure:
@@ -202,13 +227,14 @@ This would create the following navigation structure:
To add auxiliary links to your site (in the upper right on all pages), add it to the `aux_links` [configuration option]({{ site.baseurl }}{% link docs/configuration.md %}#aux-links) in your site's `_config.yml` file.
#### Example
+
{: .no_toc }
```yaml
# Aux links for the upper right navigation
aux_links:
"Just the Docs on GitHub":
- - "//github.com/pmarsceill/just-the-docs"
+ - "//github.com/just-the-docs/just-the-docs"
```
---
@@ -218,20 +244,23 @@ aux_links:
To generate a Table of Contents on your docs pages, you can use the `{:toc}` method from Kramdown, immediately after an `<ol>` in Markdown. This will automatically generate an ordered list of anchor links to various sections of the page based on headings and heading levels. There may be occasions where you're using a heading and you don't want it to show up in the TOC, so to skip a particular heading use the `{: .no_toc }` CSS class.
#### Example
+
{: .no_toc }
```markdown
# Navigation Structure
+
{: .no_toc }
## Table of contents
+
{: .no_toc .text-delta }
1. TOC
-{:toc}
+ {:toc}
```
-This example skips the page name heading (`#`) from the TOC, as well as the heading for the Table of Contents itself (`##`) because it is redundant, followed by the table of contents itself. To get an unordered list, replace `1. TOC` above by `- TOC`.
+This example skips the page name heading (`#`) from the TOC, as well as the heading for the Table of Contents itself (`##`) because it is redundant, followed by the table of contents itself. To get an unordered list, replace `1. TOC` above by `- TOC`.
### Collapsible Table of Contents
diff --git a/docs/search.md b/docs/search.md
index 495884df3e5987437361c5c143776c2f1d221c26..69bd106741c849f3e2a411a38d5a07a2ad217372 100644
--- a/docs/search.md
+++ b/docs/search.md
@@ -5,13 +5,15 @@ nav_order: 7
---
# Search
+
{: .no_toc }
## Table of contents
+
{: .no_toc .text-delta }
1. TOC
-{:toc}
+ {:toc}
---
@@ -76,7 +78,7 @@ To allow search for hyphenated words:
search.tokenizer_separator: /[\s/]+/
```
-### Display URL in search results
+### Display URL in search results
```yaml
# Display the relative url in search results
@@ -94,13 +96,13 @@ The search button displays in the bottom right corner of the screen and triggers
search.button: true
```
-
## Hiding pages from search
Sometimes you might have a page that you don't want to be indexed for the search nor to show up in search results, e.g, a 404 page.
To exclude a page from search, add the `search_exclude: true` parameter to the page's YAML front matter:
#### Example
+
{: .no_toc }
```yaml
@@ -110,8 +112,8 @@ title: Page not found
nav_exclude: true
search_exclude: true
---
-```
+```
## Generate search index when used as a gem
@@ -124,4 +126,4 @@ $ bundle exec just-the-docs rake search:init
```
This command creates the `assets/js/zzzz-search-data.json` file that Jekyll uses to create your search index.
-Alternatively, you can create the file manually with [this content]({{ site.github.repository_url }}/blob/master/assets/js/zzzz-search-data.json).
+Alternatively, you can create the file manually with [this content]({{ site.github.repository_url }}/blob/main/assets/js/zzzz-search-data.json).
diff --git a/docs/tests/index.md b/docs/tests/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..27fc4d758ff6fe47b261f84e11ac2dcc31d7e138
--- /dev/null
+++ b/docs/tests/index.md
@@ -0,0 +1,22 @@
+---
+layout: default
+title: Tests
+has_children: true
+nav_order: 100
+---
+
+# Tests
+
+ The main documentation pages of this theme illustrate the use of many of its features, which to some extent tests their implementation. The pages linked below provide further test cases for particular features, and may be useful for regression testing when developing new features.
+
+The default configuration does not include the test pages. To include them, *commment-out* the following line in `_config.yml`:
+
+```yaml
+, "docs/tests/"
+```
+so that it is:
+```yaml
+# , "docs/tests/"
+```
+
+(Apparently Jekyll's `include` does *not* override `exclude` for the same folder...)
diff --git a/docs/tests/navigation/disambiguation/a.md b/docs/tests/navigation/disambiguation/a.md
new file mode 100644
index 0000000000000000000000000000000000000000..b680fe6a0f616eb7e9ddb16738665f32e7b2319e
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/a.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Tests for disambiguation A
+has_children: true
+---
+
+# A
+
+A top-level page
+
+```yaml
+title: Tests for disambiguation A
+has_children: true
+```
diff --git a/docs/tests/navigation/disambiguation/b.md b/docs/tests/navigation/disambiguation/b.md
new file mode 100644
index 0000000000000000000000000000000000000000..23403e8a3f9f598bd56dd334e4065add3bc526cb
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/b.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Tests for disambiguation B
+has_children: true
+---
+
+# B
+
+A top-level page
+
+```yaml
+title: Tests for disambiguation B
+has_children: true
+```
diff --git a/docs/tests/navigation/disambiguation/ca.md b/docs/tests/navigation/disambiguation/ca.md
new file mode 100644
index 0000000000000000000000000000000000000000..e645044ea6c0d06e4f3b0e6f55e53328fe7b28d8
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/ca.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Tests for disambiguation C
+parent: Tests for disambiguation A
+has_children: true
+---
+
+# C
+
+A child of page A, and parent of page D
+
+```yaml
+title: Tests for disambiguation C
+parent: Tests for disambiguation A
+has_children: true
+```
diff --git a/docs/tests/navigation/disambiguation/cb.md b/docs/tests/navigation/disambiguation/cb.md
new file mode 100644
index 0000000000000000000000000000000000000000..d15844ff72a4a053ea117acc01269ac476fbf53a
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/cb.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Tests for disambiguation C
+parent: Tests for disambiguation B
+has_children: true
+---
+
+# C
+
+A child of page B, and parent of page D
+
+```yaml
+title: Tests for disambiguation C
+parent: Tests for disambiguation B
+has_children: true
+```
diff --git a/docs/tests/navigation/disambiguation/dca.md b/docs/tests/navigation/disambiguation/dca.md
new file mode 100644
index 0000000000000000000000000000000000000000..c01dbbbc25832517da7cc4f370a111910142ee57
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/dca.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Tests for disambiguation D
+parent: Tests for disambiguation C
+grand_parent: Tests for disambiguation A
+---
+
+# D
+
+A grandchild of page A
+
+```yaml
+title: Tests for disambiguation D
+parent: Tests for disambiguation C
+grand_parent: Tests for disambiguation A
+```
diff --git a/docs/tests/navigation/disambiguation/dcb.md b/docs/tests/navigation/disambiguation/dcb.md
new file mode 100644
index 0000000000000000000000000000000000000000..f80d83d2629d4aa728743ca38eb0ed70353e5db6
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/dcb.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Tests for disambiguation D
+parent: Tests for disambiguation C
+grand_parent: Tests for disambiguation B
+---
+
+# D
+
+A grandchild of page B
+
+```yaml
+title: Tests for disambiguation D
+parent: Tests for disambiguation C
+grand_parent: Tests for disambiguation B
+```
diff --git a/docs/tests/navigation/disambiguation/index.md b/docs/tests/navigation/disambiguation/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..3d8f799c0b9dc92b35e58f5e3ea36a931782616c
--- /dev/null
+++ b/docs/tests/navigation/disambiguation/index.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Disambiguation
+parent: Navigation
+grand_parent: Tests
+---
+
+# Disambiguation
+
+When different pages with children have the same title, referencing the relevant grandparent in the children disambiguates which page is intended.
+
+- [Page A](a/) has a child [page with title C](ca/), and a grandchild [page with title D](dca/).
+- [Page B](b/) has a child [page with title C](cb/), and a grandchild [page with title D](dcb/).
+- The grandchild pages specify their parent and grandparent pages, so there is no ambiguity.
diff --git a/docs/tests/navigation/exclusion/0.md b/docs/tests/navigation/exclusion/0.md
new file mode 100644
index 0000000000000000000000000000000000000000..96634dd5816620ae2ba5efe1c6f5ebc1dfe84e50
--- /dev/null
+++ b/docs/tests/navigation/exclusion/0.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Tests for exclusion 0
+has_children: true
+nav_exclude: true
+---
+# Tests for exclusion 0
+
+```yaml
+title: Tests for exclusion 0
+has_children: true
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/00.md b/docs/tests/navigation/exclusion/00.md
new file mode 100644
index 0000000000000000000000000000000000000000..44aadd1e45b345fd8f402876c09fc7663812906c
--- /dev/null
+++ b/docs/tests/navigation/exclusion/00.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Tests for exclusion 00
+parent: Tests for exclusion 0
+has_children: true
+nav_exclude: true
+---
+# Tests for exclusion 00
+
+```yaml
+title: Tests for exclusion 00
+parent: Tests for exclusion 0
+has_children: true
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/000.md b/docs/tests/navigation/exclusion/000.md
new file mode 100644
index 0000000000000000000000000000000000000000..5846671e0ec55939a1283229996d0e512b798b16
--- /dev/null
+++ b/docs/tests/navigation/exclusion/000.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 000
+parent: Tests for exclusion 00
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: true
+---
+# Tests for exclusion 000
+
+```yaml
+title: Tests for exclusion 000
+parent: Tests for exclusion 00
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/001.md b/docs/tests/navigation/exclusion/001.md
new file mode 100644
index 0000000000000000000000000000000000000000..3afe961f1d37907accb9846fb54f450d8d4d7864
--- /dev/null
+++ b/docs/tests/navigation/exclusion/001.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 001
+parent: Tests for exclusion 00
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: false
+---
+# Tests for exclusion 001
+
+```yaml
+title: Tests for exclusion 001
+parent: Tests for exclusion 00
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/01.md b/docs/tests/navigation/exclusion/01.md
new file mode 100644
index 0000000000000000000000000000000000000000..0855b2cbbcd7412916a78fb453256da413494129
--- /dev/null
+++ b/docs/tests/navigation/exclusion/01.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Tests for exclusion 01
+parent: Tests for exclusion 0
+has_children: true
+nav_exclude: false
+---
+# Tests for exclusion 01
+
+```yaml
+title: Tests for exclusion 01
+parent: Tests for exclusion 0
+has_children: true
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/010.md b/docs/tests/navigation/exclusion/010.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9944edf3abe5af18e007cef9a024b7731c519d7
--- /dev/null
+++ b/docs/tests/navigation/exclusion/010.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 010
+parent: Tests for exclusion 01
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: true
+---
+# Tests for exclusion 010
+
+```yaml
+title: Tests for exclusion 010
+parent: Tests for exclusion 01
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/011.md b/docs/tests/navigation/exclusion/011.md
new file mode 100644
index 0000000000000000000000000000000000000000..f8359b445132af474b962b292cc57dcf06fe9d8c
--- /dev/null
+++ b/docs/tests/navigation/exclusion/011.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 011
+parent: Tests for exclusion 01
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: false
+---
+# Tests for exclusion 011
+
+```yaml
+title: Tests for exclusion 011
+parent: Tests for exclusion 01
+grand_parent: Tests for exclusion 0
+has_children: false
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/1.md b/docs/tests/navigation/exclusion/1.md
new file mode 100644
index 0000000000000000000000000000000000000000..0b6bff87e5a7f93f29248ded796a78eed04e751c
--- /dev/null
+++ b/docs/tests/navigation/exclusion/1.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Tests for exclusion 1
+has_children: true
+nav_exclude: false
+---
+# Tests for exclusion 1
+
+```yaml
+title: Tests for exclusion 1
+has_children: true
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/10.md b/docs/tests/navigation/exclusion/10.md
new file mode 100644
index 0000000000000000000000000000000000000000..624d11590da5cc8f04083d04630fde18c96c61fd
--- /dev/null
+++ b/docs/tests/navigation/exclusion/10.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Tests for exclusion 10
+parent: Tests for exclusion 1
+has_children: true
+nav_exclude: true
+---
+# Tests for exclusion 10
+
+```yaml
+title: Tests for exclusion 10
+parent: Tests for exclusion 1
+has_children: true
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/100.md b/docs/tests/navigation/exclusion/100.md
new file mode 100644
index 0000000000000000000000000000000000000000..89a80906319fe2275c8f7596e3b78fb11852c06c
--- /dev/null
+++ b/docs/tests/navigation/exclusion/100.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 100
+parent: Tests for exclusion 10
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: true
+---
+# Tests for exclusion 100
+
+```yaml
+title: Tests for exclusion 100
+parent: Tests for exclusion 10
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/101.md b/docs/tests/navigation/exclusion/101.md
new file mode 100644
index 0000000000000000000000000000000000000000..240dac7675cba031106d6f2a33ccb691758bc25d
--- /dev/null
+++ b/docs/tests/navigation/exclusion/101.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 101
+parent: Tests for exclusion 10
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: false
+---
+# Tests for exclusion 101
+
+```yaml
+title: Tests for exclusion 101
+parent: Tests for exclusion 10
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/11.md b/docs/tests/navigation/exclusion/11.md
new file mode 100644
index 0000000000000000000000000000000000000000..04cef6367efe5fe1c9637d77499edc48447ccea6
--- /dev/null
+++ b/docs/tests/navigation/exclusion/11.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Tests for exclusion 11
+parent: Tests for exclusion 1
+has_children: true
+nav_exclude: false
+---
+# Tests for exclusion 11
+
+```yaml
+title: Tests for exclusion 11
+parent: Tests for exclusion 1
+has_children: true
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/110.md b/docs/tests/navigation/exclusion/110.md
new file mode 100644
index 0000000000000000000000000000000000000000..7c24237e30e117f8dd343ecb793a4b559fbc3107
--- /dev/null
+++ b/docs/tests/navigation/exclusion/110.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 110
+parent: Tests for exclusion 11
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: true
+---
+# Tests for exclusion 110
+
+```yaml
+title: Tests for exclusion 110
+parent: Tests for exclusion 11
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/111.md b/docs/tests/navigation/exclusion/111.md
new file mode 100644
index 0000000000000000000000000000000000000000..230b55b88c4dd4bbc5a1a5284f9cccf2b566e9cd
--- /dev/null
+++ b/docs/tests/navigation/exclusion/111.md
@@ -0,0 +1,17 @@
+---
+layout: default
+title: Tests for exclusion 111
+parent: Tests for exclusion 11
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: false
+---
+# Tests for exclusion 111
+
+```yaml
+title: Tests for exclusion 111
+parent: Tests for exclusion 11
+grand_parent: Tests for exclusion 1
+has_children: false
+nav_exclude: false
+```
diff --git a/docs/tests/navigation/exclusion/excluded.md b/docs/tests/navigation/exclusion/excluded.md
new file mode 100644
index 0000000000000000000000000000000000000000..5f67d2b082202e77bf21c15380f0a40beb474e27
--- /dev/null
+++ b/docs/tests/navigation/exclusion/excluded.md
@@ -0,0 +1,11 @@
+---
+layout: default
+nav_exclude: true
+---
+# Tests for exclusion untitled and excluded
+
+This page does not have a `title`, and it is explicitly excluded from the navigation
+
+```yaml
+nav_exclude: true
+```
diff --git a/docs/tests/navigation/exclusion/index.md b/docs/tests/navigation/exclusion/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..b7d4a3b45ccb250bb22a340225bcdb80c50a236d
--- /dev/null
+++ b/docs/tests/navigation/exclusion/index.md
@@ -0,0 +1,36 @@
+---
+layout: default
+title: Exclusion
+parent: Navigation
+grand_parent: Tests
+---
+
+# Exclusion
+
+Pages excluded from the main navigation can have parents and children. Navigation to and between excluded pages can be supported by the auto-generating list of child pages inserted at the bottom of each page, and by links to parents in the breadcrumbs at the top of each page.
+
+The following tests cover all combinations of excluded and included pages for the top level, child pages, and grandchild pages. The last binary digit in a page title indicates whether the page is included (1) or excluded (0); preceding digits refer to its parent and grandparent.
+
+## Included in main navigation
+
+- [Tests for exclusion 1](1/)
+- [Tests for exclusion 11](11/)
+- [Tests for exclusion 111](111/)
+
+## Included only in child navigation
+
+- [Tests for exclusion 110](110/)
+- [Tests for exclusion 10](10/)
+- [Tests for exclusion 101](101/)
+- [Tests for exclusion 100](100/)
+- [Tests for exclusion 01](01/)
+- [Tests for exclusion 011](011/)
+- [Tests for exclusion 010](010/)
+- [Tests for exclusion 00](00/)
+- [Tests for exclusion 001](001/)
+- [Tests for exclusion 000](000/)
+
+## Not included in main or child navigation
+
+- [Tests for exclusion 0](0/)
+- ["Untitled"](untitled/)
diff --git a/docs/tests/navigation/exclusion/untitled.md b/docs/tests/navigation/exclusion/untitled.md
new file mode 100644
index 0000000000000000000000000000000000000000..4d8b4b40ff38a1f51843c4883a8a2196372096b7
--- /dev/null
+++ b/docs/tests/navigation/exclusion/untitled.md
@@ -0,0 +1,6 @@
+---
+layout: default
+---
+# Tests for exclusion untitled
+
+This page does not have a `title`, and it is excluded from the navigation -- unless it is located in a Jekyll collection (which provides default titles). To exclude a title-less page from the navigation, regardless of whether it is located in a collection, set `nav_exclude: true`.
diff --git a/docs/tests/navigation/index.md b/docs/tests/navigation/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..90c671171b95ce532fdf02efa3609ca2057d72b7
--- /dev/null
+++ b/docs/tests/navigation/index.md
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Navigation
+parent: Tests
+has_children: true
+---
+
+# Navigation
diff --git a/docs/tests/navigation/order/default/10.md b/docs/tests/navigation/order/default/10.md
new file mode 100644
index 0000000000000000000000000000000000000000..7e1d82a7267af407a388184ede532b0dceef6db5
--- /dev/null
+++ b/docs/tests/navigation/order/default/10.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: "10"
+parent: Default
+grand_parent: Tests for order
+---
+
+# 10
+
+```yaml
+title: "10"
+parent: Default
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/default/2.md b/docs/tests/navigation/order/default/2.md
new file mode 100644
index 0000000000000000000000000000000000000000..158f49a1371fe1dbef01faea80de8d07be0e32e7
--- /dev/null
+++ b/docs/tests/navigation/order/default/2.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: "2"
+parent: Default
+grand_parent: Tests for order
+---
+
+# 2
+
+```yaml
+title: "2"
+parent: Default
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/default/a.md b/docs/tests/navigation/order/default/a.md
new file mode 100644
index 0000000000000000000000000000000000000000..bd7e347f7ef03dddcac362673570dc3c40ab4fe7
--- /dev/null
+++ b/docs/tests/navigation/order/default/a.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: A
+parent: Default
+grand_parent: Tests for order
+---
+
+# A
+
+```yaml
+title: A
+parent: Default
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/default/aa-lower.md b/docs/tests/navigation/order/default/aa-lower.md
new file mode 100644
index 0000000000000000000000000000000000000000..295ed08eba501f092a507209de0ecbb56b12f3dc
--- /dev/null
+++ b/docs/tests/navigation/order/default/aa-lower.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: aa
+parent: Default
+grand_parent: Tests for order
+---
+
+# aa
+
+```yaml
+title: aa
+parent: Default
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/default/aa.md b/docs/tests/navigation/order/default/aa.md
new file mode 100644
index 0000000000000000000000000000000000000000..f100030e622fe1e99898f130490f2ec62c11442d
--- /dev/null
+++ b/docs/tests/navigation/order/default/aa.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Aa
+parent: Default
+grand_parent: Tests for order
+---
+
+# Aa
+
+```yaml
+title: Aa
+parent: Default
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/default/index.md b/docs/tests/navigation/order/default/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..c276bb3eec58c4b5afce117dc291facc4b49bf05
--- /dev/null
+++ b/docs/tests/navigation/order/default/index.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Default
+parent: Tests for order
+nav_order: 1
+has_children: true
+---
+
+# Default Order
+
+When `nav_order` fields are omitted, the pages are ordered alphabetically by their titles.
+
+By default, all Capital letters come before all lowercase letters; you can add `nav_sort: case_insensitive` in the configuration file to ignore the case).
+
+Digits precede letters, and numeric titles are ordered lexicographically: `10` precedes `2` (in contrast to explicit numeric `nav_order` values).
diff --git a/docs/tests/navigation/order/floats/-1.1.md b/docs/tests/navigation/order/floats/-1.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..ee040c8290620755132b62c93e710daec9143372
--- /dev/null
+++ b/docs/tests/navigation/order/floats/-1.1.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "-1.1"
+nav_order: -1.1
+parent: Floats
+grand_parent: Tests for order
+---
+
+# -1.1
+
+```yaml
+title: "-1.1"
+nav_order: -1.1
+parent: Floats
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/floats/0.0.md b/docs/tests/navigation/order/floats/0.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5e516dd2144ebb403953a3e483e5f8ef560a564
--- /dev/null
+++ b/docs/tests/navigation/order/floats/0.0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "0.0"
+nav_order: 0.0
+parent: Floats
+grand_parent: Tests for order
+---
+
+# 0.0
+
+```yaml
+title: "0.0"
+nav_order: 0.0
+parent: Floats
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/floats/10.0.md b/docs/tests/navigation/order/floats/10.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..797f81d1604c0f55791b7faafa7b6766e401149e
--- /dev/null
+++ b/docs/tests/navigation/order/floats/10.0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "10.0"
+nav_order: 10.0
+parent: Floats
+grand_parent: Tests for order
+---
+
+# 10.0
+
+```yaml
+title: "10.0"
+nav_order: 10.0
+parent: Floats
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/floats/2.2222.md b/docs/tests/navigation/order/floats/2.2222.md
new file mode 100644
index 0000000000000000000000000000000000000000..89109469d866e2336bacc854ebf479c2059c5794
--- /dev/null
+++ b/docs/tests/navigation/order/floats/2.2222.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "2.2222"
+nav_order: 2.2222
+parent: Floats
+grand_parent: Tests for order
+---
+
+# 2.2222
+
+```yaml
+title: "2.2222"
+nav_order: 2.2222
+parent: Floats
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/floats/index.md b/docs/tests/navigation/order/floats/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..2846629b46e3e96e81c4460cfeb7e377ebcd4cd4
--- /dev/null
+++ b/docs/tests/navigation/order/floats/index.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Floats
+parent: Tests for order
+nav_order: 4
+has_children: true
+---
+
+# Floating-Point Order
+
+When `nav_order` fields are floating-point numbers, the pages are ordered in increasing order of the numerical values.
+
+Floats include `0.0` and negative values.
diff --git a/docs/tests/navigation/order/index.md b/docs/tests/navigation/order/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..9dbff4a5911c1ea4ffd2ddb8fc0365bf8234e164
--- /dev/null
+++ b/docs/tests/navigation/order/index.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Order
+parent: Navigation
+grand_parent: Tests
+---
+
+# Order
+
+The value of `nav_order` can be numbers (integers, floats) and/or strings. The following tests illustrate their effects.
+
+- [Default](default/), using `title` instead of `nav_order` fields.
+- [Strings](strings/), lexicographically ordered, possibly case-insensitively.
+- [Integers](integers/), numerically ordered.
+- [Floats](floats/), numerically ordered.
+- [Mixture](mixture/), with numbers before strings.
diff --git a/docs/tests/navigation/order/integers/-1.md b/docs/tests/navigation/order/integers/-1.md
new file mode 100644
index 0000000000000000000000000000000000000000..8b1444ea42575b8f3b023e02ff36db5d9fb2307c
--- /dev/null
+++ b/docs/tests/navigation/order/integers/-1.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "-1"
+nav_order: -1
+parent: Integers
+grand_parent: Tests for order
+---
+
+# -1
+
+```yaml
+title: "-1"
+nav_order: -1
+parent: Integers
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/integers/0.md b/docs/tests/navigation/order/integers/0.md
new file mode 100644
index 0000000000000000000000000000000000000000..21b13277b1916d2ba0286d672de6b2d8ac27d6e9
--- /dev/null
+++ b/docs/tests/navigation/order/integers/0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "0"
+nav_order: 0
+parent: Integers
+grand_parent: Tests for order
+---
+
+# 0
+
+```yaml
+title: "0"
+nav_order: 0
+parent: Integers
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/integers/10.md b/docs/tests/navigation/order/integers/10.md
new file mode 100644
index 0000000000000000000000000000000000000000..41571511dd0cb0c39f505a6efe6ebbf95581b9d6
--- /dev/null
+++ b/docs/tests/navigation/order/integers/10.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "10"
+nav_order: 10
+parent: Integers
+grand_parent: Tests for order
+---
+
+# 10
+
+```yaml
+title: "10"
+nav_order: 10
+parent: Integers
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/integers/2.md b/docs/tests/navigation/order/integers/2.md
new file mode 100644
index 0000000000000000000000000000000000000000..2ebb1cab3619b5fc5d65f8d8817a514631abf053
--- /dev/null
+++ b/docs/tests/navigation/order/integers/2.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "2"
+nav_order: 2
+parent: Integers
+grand_parent: Tests for order
+---
+
+# 2
+
+```yaml
+title: "2"
+nav_order: 2
+parent: Integers
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/integers/index.md b/docs/tests/navigation/order/integers/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..077cdc56a55dcdaa052469acd83b3c2d8439d9f6
--- /dev/null
+++ b/docs/tests/navigation/order/integers/index.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Integers
+parent: Tests for order
+nav_order: 3
+has_children: true
+---
+
+# Integer Order
+
+When `nav_order` fields are integers, the pages are ordered in increasing order of the numerical values.
+
+Integers include `0` and negative values. Integers can be reused for top-level pages and for different sets of child pages.
diff --git a/docs/tests/navigation/order/mixture/-1.1.md b/docs/tests/navigation/order/mixture/-1.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..668d64212a0abec3cf136805d4c43065cab402ca
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/-1.1.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "-1.1"
+nav_order: -1.1
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# -1.1
+
+```yaml
+title: "-1.1"
+nav_order: -1.1
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/-1.md b/docs/tests/navigation/order/mixture/-1.md
new file mode 100644
index 0000000000000000000000000000000000000000..e1c5a1266b754e7580140495c9365349cdeee69e
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/-1.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "-1"
+nav_order: -1
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# -1
+
+```yaml
+title: "-1"
+nav_order: -1
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/0.0.md b/docs/tests/navigation/order/mixture/0.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..a2006d8e96dc45b63cb85811b6d62e47464cb15e
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/0.0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "0.0"
+nav_order: 0.0
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 0.0
+
+```yaml
+title: "0.0"
+nav_order: 0.0
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/0.md b/docs/tests/navigation/order/mixture/0.md
new file mode 100644
index 0000000000000000000000000000000000000000..14f137fe261fc799cdd3fe3c62b0cb0bbc455ef6
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "0"
+nav_order: 0
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 0
+
+```yaml
+title: "0"
+nav_order: 0
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/10.0.md b/docs/tests/navigation/order/mixture/10.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..70308a6b8eff6c249b030ed6308818d2c302b481
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/10.0.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "10.0"
+nav_order: 10.0
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 10.0
+
+```yaml
+title: "10.0"
+nav_order: 10.0
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/10.md b/docs/tests/navigation/order/mixture/10.md
new file mode 100644
index 0000000000000000000000000000000000000000..542ae3ff1cd8de4c2f9b740c62dab0276d69617f
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/10.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: "10"
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 10
+
+```yaml
+title: "10"
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/2.2222.md b/docs/tests/navigation/order/mixture/2.2222.md
new file mode 100644
index 0000000000000000000000000000000000000000..2520d512006dfdc634e31edc0eb29bdae717f43c
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/2.2222.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "2.2222"
+nav_order: 2.2222
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 2.2222
+
+```yaml
+title: "2.2222"
+nav_order: 2.2222
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/2.md b/docs/tests/navigation/order/mixture/2.md
new file mode 100644
index 0000000000000000000000000000000000000000..2ae45535136a5e8a401d1663dc56c9ae45b87be9
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/2.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: "2"
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# 2
+
+```yaml
+title: "2"
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/a.md b/docs/tests/navigation/order/mixture/a.md
new file mode 100644
index 0000000000000000000000000000000000000000..342b05f0780782d2c24ecd98cc384b05d13c0825
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/a.md
@@ -0,0 +1,14 @@
+---
+layout: default
+title: A
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# A
+
+```yaml
+title: A
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/aa-lower.md b/docs/tests/navigation/order/mixture/aa-lower.md
new file mode 100644
index 0000000000000000000000000000000000000000..2d6398534e2e782c6022e93aca0a06e36d9eab3a
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/aa-lower.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: aa
+nav_order: "aa"
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# aa
+
+```yaml
+title: aa
+nav_order: "aa"
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/aa.md b/docs/tests/navigation/order/mixture/aa.md
new file mode 100644
index 0000000000000000000000000000000000000000..69cf05f39786fdda758eab92ae1916c359ecb7ff
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/aa.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Aa
+nav_order: "Aa"
+parent: Mixture
+grand_parent: Tests for order
+---
+
+# Aa
+
+```yaml
+title: Aa
+nav_order: "Aa"
+parent: Mixture
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/mixture/index.md b/docs/tests/navigation/order/mixture/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..24317b23807307aef60159c56881fce359af71e5
--- /dev/null
+++ b/docs/tests/navigation/order/mixture/index.md
@@ -0,0 +1,11 @@
+---
+layout: default
+title: Mixture
+parent: Tests for order
+nav_order: 5
+has_children: true
+---
+
+# Mixed Order
+
+It seems unlikely that different types of `nav_order` values are needed for the children of the same parent.
diff --git a/docs/tests/navigation/order/order.md b/docs/tests/navigation/order/order.md
new file mode 100644
index 0000000000000000000000000000000000000000..2d8cebfd84d8bf547e29c830b9ba3620672b298b
--- /dev/null
+++ b/docs/tests/navigation/order/order.md
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Tests for order
+has_children: true
+---
+
+# Order
diff --git a/docs/tests/navigation/order/strings/10.md b/docs/tests/navigation/order/strings/10.md
new file mode 100644
index 0000000000000000000000000000000000000000..6c3e480ea75811eeacf96946747b1bcf79cd501a
--- /dev/null
+++ b/docs/tests/navigation/order/strings/10.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "10"
+nav_order: "10"
+parent: Strings
+grand_parent: Tests for order
+---
+
+# 10
+
+```yaml
+title: "10"
+nav_order: "10"
+parent: Strings
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/strings/2.md b/docs/tests/navigation/order/strings/2.md
new file mode 100644
index 0000000000000000000000000000000000000000..0c96c32a2c7e582d1862e86c00b793653862d4e4
--- /dev/null
+++ b/docs/tests/navigation/order/strings/2.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: "2"
+nav_order: "2"
+parent: Strings
+grand_parent: Tests for order
+---
+
+# 2
+
+```yaml
+title: "2"
+nav_order: "2"
+parent: Strings
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/strings/a.md b/docs/tests/navigation/order/strings/a.md
new file mode 100644
index 0000000000000000000000000000000000000000..ac1f3bd59af04c8abf1ab496fc8eed7e6b054f19
--- /dev/null
+++ b/docs/tests/navigation/order/strings/a.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: A
+nav_order: A
+parent: Strings
+grand_parent: Tests for order
+---
+
+# A
+
+```yaml
+title: A
+nav_order: A
+parent: Strings
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/strings/aa-lower.md b/docs/tests/navigation/order/strings/aa-lower.md
new file mode 100644
index 0000000000000000000000000000000000000000..0cbb0b259e625f86030c8bdb2449821dd0df1d14
--- /dev/null
+++ b/docs/tests/navigation/order/strings/aa-lower.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: aa
+nav_order: "aa"
+parent: Strings
+grand_parent: Tests for order
+---
+
+# aa
+
+```yaml
+title: aa
+nav_order: "aa"
+parent: Strings
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/strings/aa.md b/docs/tests/navigation/order/strings/aa.md
new file mode 100644
index 0000000000000000000000000000000000000000..6eaf7a246f71d24afb4dbd92ca57a8dbe3e7d55b
--- /dev/null
+++ b/docs/tests/navigation/order/strings/aa.md
@@ -0,0 +1,16 @@
+---
+layout: default
+title: Aa
+nav_order: "Aa"
+parent: Strings
+grand_parent: Tests for order
+---
+
+# Aa
+
+```yaml
+title: Aa
+nav_order: "Aa"
+parent: Strings
+grand_parent: Tests for order
+```
diff --git a/docs/tests/navigation/order/strings/index.md b/docs/tests/navigation/order/strings/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..404e3a86548303bc5a34eebc0fb7ab34d477c781
--- /dev/null
+++ b/docs/tests/navigation/order/strings/index.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Strings
+parent: Tests for order
+nav_order: 2
+has_children: true
+---
+
+# String Order
+
+By default, all Capital letters come before all lowercase letters; you can add `nav_sort: case_insensitive` in the configuration file to ignore the case).
+
+Digits precede letters, and numeric titles are ordered lexicographically: `"10"` precedes `"2"` (in contrast to explicit numeric `nav_order` values).
diff --git a/docs/tests/styling/dl.md b/docs/tests/styling/dl.md
new file mode 100644
index 0000000000000000000000000000000000000000..49dc034e385613c0bd374ac3ce823d01e77680b8
--- /dev/null
+++ b/docs/tests/styling/dl.md
@@ -0,0 +1,83 @@
+---
+layout: default
+title: Description lists
+parent: Styling
+grand_parent: Tests
+---
+
+# Description lists
+
+The first child element of each `dd` element in a `dl` list should be aligned with the preceding `dt` element in the following examples.
+
+term
+
+: paragraph text
+
+ paragraph text
+
+term
+
+: ### Header
+
+ paragraph text
+
+term
+
+: > block quote
+
+ paragraph text
+
+term
+
+: ```sh
+ fenced code block
+ ```
+
+ paragraph text
+
+term
+
+: + unordered list item
+ + unordered list item
+
+ paragraph text
+
+term
+
+: 1. ordered list item
+ 2. ordered list item
+
+ paragraph text
+
+term
+
+: sub-term
+ : sub-description
+
+ sub-term
+ : sub-description
+
+ paragraph text
+
+term
+
+: |-----------------+------------+-----------------+----------------|
+ | Default aligned |Left aligned| Center aligned | Right aligned |
+ |-----------------|:-----------|:---------------:|---------------:|
+ | First body part |Second cell | Third cell | fourth cell |
+ | Second line |foo | **strong** | baz |
+ | Third line |quux | baz | bar |
+ |-----------------+------------+-----------------+----------------|
+ | Second body | | | |
+ | 2 line | | | |
+ |=================+============+=================+================|
+ | Footer row | | | |
+ |-----------------+------------+-----------------+----------------|
+
+ paragraph text
+
+term
+
+: ***
+
+ paragraph text
diff --git a/docs/tests/styling/index.md b/docs/tests/styling/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..12782beb3d71b1cea30c6cdb6a90a49f0ae55654
--- /dev/null
+++ b/docs/tests/styling/index.md
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Styling
+parent: Tests
+has_children: true
+---
+
+# Styling
diff --git a/docs/tests/styling/ol.md b/docs/tests/styling/ol.md
new file mode 100644
index 0000000000000000000000000000000000000000..6e1468d4efcf19bbb6f407cf6631a465c57ceeef
--- /dev/null
+++ b/docs/tests/styling/ol.md
@@ -0,0 +1,65 @@
+---
+layout: default
+title: Ordered lists
+parent: Styling
+grand_parent: Tests
+---
+
+# Ordered lists
+
+The first child element of each `li` element in an `ol` list should be aligned with the preceding label in the following examples.
+
+1. paragraph text
+
+ paragraph text
+
+1. ### Header
+
+ paragraph text
+
+1. > block quote
+
+ paragraph text
+
+1. ```sh
+ fenced code block
+ ```
+
+ paragraph text
+
+1. + unordered list item
+ + unordered list item
+
+ paragraph text
+
+1. 1. ordered list item
+ 2. ordered list item
+
+ paragraph text
+
+1. term
+ : description
+
+ term
+ : description
+
+ paragraph text
+
+1. |-----------------+------------+-----------------+----------------|
+ | Default aligned |Left aligned| Center aligned | Right aligned |
+ |-----------------|:-----------|:---------------:|---------------:|
+ | First body part |Second cell | Third cell | fourth cell |
+ | Second line |foo | **strong** | baz |
+ | Third line |quux | baz | bar |
+ |-----------------+------------+-----------------+----------------|
+ | Second body | | | |
+ | 2 line | | | |
+ |=================+============+=================+================|
+ | Footer row | | | |
+ |-----------------+------------+-----------------+----------------|
+
+ paragraph text
+
+1. ***
+
+ paragraph text
diff --git a/docs/tests/styling/ul.md b/docs/tests/styling/ul.md
new file mode 100644
index 0000000000000000000000000000000000000000..070b41a6f13a9414fcc38d6a9f074caf8d9eb255
--- /dev/null
+++ b/docs/tests/styling/ul.md
@@ -0,0 +1,65 @@
+---
+layout: default
+title: Unordered lists
+parent: Styling
+grand_parent: Tests
+---
+
+# Unordered lists
+
+The first child element of each `li` element in a `ul` list should be aligned with the preceding bullet in the following examples.
+
+- paragraph text
+
+ paragraph text
+
+- ### Header
+
+ paragraph text
+
+- > block quote
+
+ paragraph text
+
+- ```sh
+ fenced code block
+ ```
+
+ paragraph text
+
+- + unordered list item
+ + unordered list item
+
+ paragraph text
+
+- 1. ordered list item
+ 2. ordered list item
+
+ paragraph text
+
+- term
+ : description
+
+ term
+ : description
+
+ paragraph text
+
+- |-----------------+------------+-----------------+----------------|
+ | Default aligned |Left aligned| Center aligned | Right aligned |
+ |-----------------|:-----------|:---------------:|---------------:|
+ | First body part |Second cell | Third cell | fourth cell |
+ | Second line |foo | **strong** | baz |
+ | Third line |quux | baz | bar |
+ |-----------------+------------+-----------------+----------------|
+ | Second body | | | |
+ | 2 line | | | |
+ |=================+============+=================+================|
+ | Footer row | | | |
+ |-----------------+------------+-----------------+----------------|
+
+ paragraph text
+
+- ***
+
+ paragraph text
diff --git a/docs/ui-components/code.md b/docs/ui-components/code.md
index e53a90de42fefdd9117d9771d62051776299688a..b8136a3508d6cb45c6b5f2e8f91b98dbb2849ae7 100644
--- a/docs/ui-components/code.md
+++ b/docs/ui-components/code.md
@@ -2,6 +2,7 @@
layout: default
title: Code
parent: UI Components
+has_children: true
nav_order: 6
---
diff --git a/docs/ui-components/line-nos.md b/docs/ui-components/line-nos.md
new file mode 100644
index 0000000000000000000000000000000000000000..1baa3da91822d27e1001f9383074be8888ffe99e
--- /dev/null
+++ b/docs/ui-components/line-nos.md
@@ -0,0 +1,115 @@
+---
+layout: default
+title: Code with line numbers
+parent: Code
+grand_parent: UI Components
+permalink: /docs/ui-components/code/line-numbers/
+---
+
+# Code snippets with line numbers
+
+The default settings for HTML compression are incompatible with the HTML
+produced by Jekyll (4.1.1 or earlier) for line numbers from highlighted code
+-- both when using Kramdown code fences and when using Liquid highlight tags.
+
+To avoid non-conforming HTML and unsatisfactory layout, HTML compression
+can be turned off by using the following configuration option:
+
+{% highlight yaml %}
+compress_html:
+ ignore:
+ envs: all
+{% endhighlight %}
+
+When using Kramdown code fences, line numbers are turned on globally by the
+following configuration option:
+
+{% highlight yaml %}
+kramdown:
+ syntax_highlighter_opts:
+ block:
+ line_numbers: true
+{% endhighlight %}
+
+Line numbers can then be suppressed locally using Liquid tags (_without_ the
+`linenos` option) instead of fences:
+
+{% highlight yaml %}
+{% raw %}{% highlight some_language %}
+Some code
+{% endhighlight %}{% endraw %}
+{% endhighlight %}
+
+## Workarounds
+
+To use HTML compression together with line numbers, all highlighted code
+needs to be wrapped using one of the following workarounds.
+(The variable name `some_var` can be changed to avoid clashes; it can also
+be replaced by `code` -- but note that `code=code` cannot be removed).
+
+### Code fences (three backticks)
+
+{% highlight default %}
+{% raw %}{% capture some_var %}
+```some_language
+Some code
+```
+{% endcapture %}
+{% assign some_var = some_var | markdownify %}
+{% include fix_linenos.html code=some_var %}{% endraw %}
+{% endhighlight %}
+
+### Liquid highlighting
+
+{% highlight default %}
+{% raw %}{% capture some_var %}
+{% highlight some_language linenos %}
+Some code
+{% endhighlight %}
+{% endcapture %}
+{% include fix_linenos.html code=some_var %}{% endraw %}
+{% endhighlight %}
+
+_Credit:_ The original version of the above workaround was suggested by
+Dmitry Hrabrov at
+<https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901>.
+
+## Examples
+
+✅ Using code fences + workaround (will only show line numbers if enabled globally in `_config.yml`):
+
+{% capture code_fence %}
+```js
+// Javascript code with syntax highlighting in fences
+var fun = function lang(l) {
+ dateformat.i18n = require('./lang/' + l)
+ return true;
+}
+```
+{% endcapture %}
+{% assign code_fence = code_fence | markdownify %}
+{% include fix_linenos.html code=code_fence %}
+
+✅ Using liquid highlighting + workaround:
+
+{% capture code %}
+{% highlight ruby linenos %}
+# Ruby code with syntax highlighting and fixed line numbers using Liquid
+GitHubPages::Dependencies.gems.each do |gem, version|
+ s.add_dependency(gem, "= #{version}")
+end
+{% endhighlight %}
+{% endcapture %}
+{% include fix_linenos.html code=code %}
+{% assign code = nil %}
+
+⌠With the default configuration options, the following example illustrates
+the **incorrect** formatting arising from the incompatibility of HTML compression
+and the non-conforming HTML produced by Jekyll for line numbers:
+
+{% highlight ruby linenos %}
+# Ruby code with syntax highlighting and unfixed line numbers using Liquid
+GitHubPages::Dependencies.gems.each do |gem, version|
+ s.add_dependency(gem, "= #{version}")
+end
+{% endhighlight %}
diff --git a/docs/ui-components/typography.md b/docs/ui-components/typography.md
index 2838a795fff7a83c2250204d8e83e1a1969b489d..b879c95299a0406bac8d5e4917bf3acd7e5e1d0a 100644
--- a/docs/ui-components/typography.md
+++ b/docs/ui-components/typography.md
@@ -21,7 +21,7 @@ nav_order: 1
By default, Just the Docs uses a native system font stack for sans-serif fonts:
```scss
--apple-system, BlinkMacSystemFont, "helvetica neue", helvetica, roboto, noto, "segoe ui", arial, sans-serif
+system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif
```
ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/index.md b/index.md
index 7bf994730edad1d0226cc1ebb069f1c55f78eea7..eb63805ac5edc6a3a280e04aacf451a68f9c2921 100644
--- a/index.md
+++ b/index.md
@@ -4,16 +4,15 @@ title: Home
nav_order: 1
description: "Just the Docs is a responsive Jekyll theme with built-in search that is easily customizable and hosted on GitHub Pages."
permalink: /
-last_modified_date: 2020-04-27T17:54:08+0000
---
-# Focus on writing good documentation
+# Focus on writing good documentation.
{: .fs-9 }
Just the Docs gives your documentation a jumpstart with a responsive Jekyll theme that is easily customizable and hosted on GitHub Pages.
{: .fs-6 .fw-300 }
-[Get started now](#getting-started){: .btn .btn-primary .fs-5 .mb-4 .mb-md-0 .mr-2 } [View it on GitHub](https://github.com/pmarsceill/just-the-docs){: .btn .fs-5 .mb-4 .mb-md-0 }
+[Get started now](#getting-started){: .btn .btn-primary .fs-5 .mb-4 .mb-md-0 .mr-2 } [View it on GitHub](https://github.com/just-the-docs/just-the-docs){: .btn .fs-5 .mb-4 .mb-md-0 }
---
@@ -26,37 +25,43 @@ Just the Docs is built for [Jekyll](https://jekyllrb.com), a static site generat
### Quick start: Use as a GitHub Pages remote theme
1. Add Just the Docs to your Jekyll site's `_config.yml` as a [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/)
+
```yaml
-remote_theme: pmarsceill/just-the-docs
+remote_theme: just-the-docs/just-the-docs
```
+
<small>You must have GitHub Pages enabled on your repo, one or more Markdown files, and a `_config.yml` file. [See an example repository](https://github.com/pmarsceill/jtd-remote)</small>
### Local installation: Use the gem-based theme
1. Install the Ruby Gem
-```bash
-$ gem install just-the-docs
-```
-```yaml
-# .. or add it to your your Jekyll site’s Gemfile
-gem "just-the-docs"
-```
+ ```bash
+ $ gem install just-the-docs
+ ```
+ ```yaml
+ # .. or add it to your your Jekyll site’s Gemfile
+ gem "just-the-docs"
+ ```
+
2. Add Just the Docs to your Jekyll site’s `_config.yml`
-```yaml
-theme: "just-the-docs"
-```
+ ```yaml
+ theme: "just-the-docs"
+ ```
+
3. _Optional:_ Initialize search data (creates `search-data.json`)
-```bash
-$ bundle exec just-the-docs rake search:init
-```
+ ```bash
+ $ bundle exec just-the-docs rake search:init
+ ```
+
3. Run you local Jekyll server
-```bash
-$ jekyll serve
-```
-```bash
-# .. or if you're using a Gemfile (bundler)
-$ bundle exec jekyll serve
-```
+ ```bash
+ $ jekyll serve
+ ```
+ ```bash
+ # .. or if you're using a Gemfile (bundler)
+ $ bundle exec jekyll serve
+ ```
+
4. Point your web browser to [http://localhost:4000](http://localhost:4000)
If you're hosting your site on GitHub Pages, [set up GitHub Pages and Jekyll locally](https://help.github.com/en/articles/setting-up-your-github-pages-site-locally-with-jekyll) so that you can more easily work in your development environment.
@@ -73,12 +78,12 @@ Just the Docs is © 2017-{{ "now" | date: "%Y" }} by [Patrick Marsceill](htt
### License
-Just the Docs is distributed by an [MIT license](https://github.com/pmarsceill/just-the-docs/tree/master/LICENSE.txt).
+Just the Docs is distributed by an [MIT license](https://github.com/just-the-docs/just-the-docs/tree/main/LICENSE.txt).
### Contributing
When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the owners of this repository before making a change. Read more about becoming a contributor in [our GitHub repo](https://github.com/pmarsceill/just-the-docs#contributing).
+email, or any other method with the owners of this repository before making a change. Read more about becoming a contributor in [our GitHub repo](https://github.com/just-the-docs/just-the-docs#contributing).
#### Thank you to the contributors of Just the Docs!
@@ -94,4 +99,4 @@ email, or any other method with the owners of this repository before making a ch
Just the Docs is committed to fostering a welcoming community.
-[View our Code of Conduct](https://github.com/pmarsceill/just-the-docs/tree/master/CODE_OF_CONDUCT.md) on our GitHub repository.
+[View our Code of Conduct](https://github.com/just-the-docs/just-the-docs/tree/main/CODE_OF_CONDUCT.md) on our GitHub repository.
diff --git a/just-the-docs.gemspec b/just-the-docs.gemspec
index c41ddaacbcf36c1ec97c01d6dee35e69314fede8..b1ba7bc9fa46a82b4463564d7f12a2d80ea6a5b4 100644
--- a/just-the-docs.gemspec
+++ b/just-the-docs.gemspec
@@ -2,18 +2,18 @@
Gem::Specification.new do |spec|
spec.name = "just-the-docs"
- spec.version = "0.3.1"
+ spec.version = "0.3.3"
spec.authors = ["Patrick Marsceill"]
spec.email = ["patrick.marsceill@gmail.com"]
spec.summary = %q{A modern, highly customizable, and responsive Jekyll theme for documention with built-in search.}
- spec.homepage = "https://github.com/pmarsceill/just-the-docs"
+ spec.homepage = "https://github.com/just-the-docs/just-the-docs"
spec.license = "MIT"
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|bin|_layouts|_includes|lib|Rakefile|_sass|LICENSE|README)}i) }
spec.executables << 'just-the-docs'
- spec.add_development_dependency "bundler", "~> 2.1.4"
+ spec.add_development_dependency "bundler", "~> 2.3.5"
spec.add_runtime_dependency "jekyll", ">= 3.8.5"
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.0"
spec.add_runtime_dependency "rake", ">= 12.3.1", "< 13.1.0"
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index 8e6305a6115a4f4f642ec859222b722b12dd5ef3..aac66bb6877b5c33c73d3d4ba66ebe0fc66e417f 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -12,8 +12,21 @@ namespace :search do
permalink: /assets/js/search-data.json
---
{
- {%- assign i = 0 -%}
- {% for page in site.html_pages %}
+{%- assign i = 0 -%}
+{%- assign pages_array = '' | split: '' -%}
+{%- assign pages_array = pages_array | push: site.html_pages -%}
+{%- if site.just_the_docs.collections -%}
+ {%- 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.search_exclude != true -%}
+ {%- assign pages_array = pages_array | push: collection -%}
+ {%- endif -%}
+ {%- endfor -%}
+{%- endif -%}
+{%- for pages in pages_array -%}
+ {%- for page in pages -%}
{%- if page.title and page.search_exclude != true -%}
{%- assign page_content = page.content -%}
{%- assign heading_level = site.search.heading_level | default: 2 -%}
@@ -24,7 +37,7 @@ permalink: /assets/js/search-data.json
{%- endfor -%}
{%- assign parts = page_content | split: \'<h1\' -%}
{%- assign title_found = false -%}
- {% for part in parts offset: 1 %}
+ {%- for part in parts offset: 1 -%}
{%- assign titleAndContent = part | split: \'</h1>\' -%}
{%- assign title = titleAndContent[0] | replace_first: \'>\', \'<h1>\' | split: \'<h1>\' -%}
{%- assign title = title[1] | strip_html -%}
@@ -47,7 +60,7 @@ permalink: /assets/js/search-data.json
"doc": {{ page.title | jsonify }},
"title": {{ title | jsonify }},
"content": {{ content | replace: \'</h\', \' . </h\' | replace: \'<hr\', \' . <hr\' | replace: \'</p\', \' . </p\' | replace: \'<ul\', \' . <ul\' | replace: \'</ul\', \' . </ul\' | replace: \'<ol\', \' . <ol\' | replace: \'</ol\', \' . </ol\' | replace: \'</tr\', \' . </tr\' | replace: \'<li\', \' | <li\' | replace: \'</li\', \' | </li\' | replace: \'</td\', \' | </td\' | replace: \'<td\', \' | <td\' | replace: \'</th\', \' | </th\' | replace: \'<th\', \' | <th\' | strip_html | remove: \'Table of contents\' | normalize_whitespace | replace: \'. . .\', \'.\' | replace: \'. .\', \'.\' | replace: \'| |\', \'|\' | append: \' \' | jsonify }},
- "url": "{{ url | absolute_url }}",
+ "url": "{{ url | relative_url }}",
"relUrl": "{{ url }}"
}
{%- assign i = i | plus: 1 -%}
@@ -58,13 +71,14 @@ permalink: /assets/js/search-data.json
"doc": {{ page.title | jsonify }},
"title": {{ page.title | jsonify }},
"content": {{ parts[0] | replace: \'</h\', \' . </h\' | replace: \'<hr\', \' . <hr\' | replace: \'</p\', \' . </p\' | replace: \'<ul\', \' . <ul\' | replace: \'</ul\', \' . </ul\' | replace: \'<ol\', \' . <ol\' | replace: \'</ol\', \' . </ol\' | replace: \'</tr\', \' . </tr\' | replace: \'<li\', \' | <li\' | replace: \'</li\', \' | </li\' | replace: \'</td\', \' | </td\' | replace: \'<td\', \' | <td\' | replace: \'</th\', \' | </th\' | replace: \'<th\', \' | <th\' | strip_html | remove: \'Table of contents\' | normalize_whitespace | replace: \'. . .\', \'.\' | replace: \'. .\', \'.\' | replace: \'| |\', \'|\' | append: \' \' | jsonify }},
- "url": "{{ page.url | absolute_url }}",
+ "url": "{{ page.url | relative_url }}",
"relUrl": "{{ page.url }}"
}
{%- assign i = i | plus: 1 -%}
{%- endunless -%}
{%- endif -%}
- {% endfor %}
+ {%- endfor -%}
+{%- endfor %}
}'
end
puts 'Done.'
diff --git a/package-lock.json b/package-lock.json
index c28c70efb0583353f33813b988a330b7927badbd..2e874fb42ec90b1bacfeb69f7806b967ba57bb9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,37 +1,37 @@
{
"name": "just-the-docs",
- "version": "0.3.1",
+ "version": "0.3.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@babel/code-frame": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
- "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+ "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
"dev": true,
"requires": {
- "@babel/highlight": "^7.10.3"
+ "@babel/highlight": "^7.10.4"
}
},
"@babel/core": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz",
- "integrity": "sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.10.3",
- "@babel/generator": "^7.10.3",
- "@babel/helper-module-transforms": "^7.10.1",
- "@babel/helpers": "^7.10.1",
- "@babel/parser": "^7.10.3",
- "@babel/template": "^7.10.3",
- "@babel/traverse": "^7.10.3",
- "@babel/types": "^7.10.3",
+ "version": "7.11.6",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
+ "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.10.4",
+ "@babel/generator": "^7.11.6",
+ "@babel/helper-module-transforms": "^7.11.0",
+ "@babel/helpers": "^7.10.4",
+ "@babel/parser": "^7.11.5",
+ "@babel/template": "^7.10.4",
+ "@babel/traverse": "^7.11.5",
+ "@babel/types": "^7.11.5",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.1",
"json5": "^2.1.2",
- "lodash": "^4.17.13",
+ "lodash": "^4.17.19",
"resolve": "^1.3.2",
"semver": "^5.4.1",
"source-map": "^0.5.0"
@@ -46,14 +46,13 @@
}
},
"@babel/generator": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
- "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
+ "version": "7.11.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+ "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.3",
+ "@babel/types": "^7.11.5",
"jsesc": "^2.5.1",
- "lodash": "^4.17.13",
"source-map": "^0.5.0"
},
"dependencies": {
@@ -66,168 +65,168 @@
}
},
"@babel/helper-function-name": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
- "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+ "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.10.3",
- "@babel/template": "^7.10.3",
- "@babel/types": "^7.10.3"
+ "@babel/helper-get-function-arity": "^7.10.4",
+ "@babel/template": "^7.10.4",
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-get-function-arity": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
- "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+ "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.3"
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-member-expression-to-functions": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz",
- "integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==",
+ "version": "7.11.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+ "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.3"
+ "@babel/types": "^7.11.0"
}
},
"@babel/helper-module-imports": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz",
- "integrity": "sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+ "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.3"
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-module-transforms": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
- "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
+ "version": "7.11.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+ "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
"dev": true,
"requires": {
- "@babel/helper-module-imports": "^7.10.1",
- "@babel/helper-replace-supers": "^7.10.1",
- "@babel/helper-simple-access": "^7.10.1",
- "@babel/helper-split-export-declaration": "^7.10.1",
- "@babel/template": "^7.10.1",
- "@babel/types": "^7.10.1",
- "lodash": "^4.17.13"
+ "@babel/helper-module-imports": "^7.10.4",
+ "@babel/helper-replace-supers": "^7.10.4",
+ "@babel/helper-simple-access": "^7.10.4",
+ "@babel/helper-split-export-declaration": "^7.11.0",
+ "@babel/template": "^7.10.4",
+ "@babel/types": "^7.11.0",
+ "lodash": "^4.17.19"
}
},
"@babel/helper-optimise-call-expression": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz",
- "integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+ "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.3"
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-replace-supers": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
- "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+ "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
"dev": true,
"requires": {
- "@babel/helper-member-expression-to-functions": "^7.10.1",
- "@babel/helper-optimise-call-expression": "^7.10.1",
- "@babel/traverse": "^7.10.1",
- "@babel/types": "^7.10.1"
+ "@babel/helper-member-expression-to-functions": "^7.10.4",
+ "@babel/helper-optimise-call-expression": "^7.10.4",
+ "@babel/traverse": "^7.10.4",
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-simple-access": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
- "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+ "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
"dev": true,
"requires": {
- "@babel/template": "^7.10.1",
- "@babel/types": "^7.10.1"
+ "@babel/template": "^7.10.4",
+ "@babel/types": "^7.10.4"
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
- "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+ "version": "7.11.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+ "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.1"
+ "@babel/types": "^7.11.0"
}
},
"@babel/helper-validator-identifier": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
- "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+ "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
"dev": true
},
"@babel/helpers": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
- "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+ "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
"dev": true,
"requires": {
- "@babel/template": "^7.10.1",
- "@babel/traverse": "^7.10.1",
- "@babel/types": "^7.10.1"
+ "@babel/template": "^7.10.4",
+ "@babel/traverse": "^7.10.4",
+ "@babel/types": "^7.10.4"
}
},
"@babel/highlight": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
- "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+ "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.3",
+ "@babel/helper-validator-identifier": "^7.10.4",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
- "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==",
+ "version": "7.11.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+ "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
"dev": true
},
"@babel/template": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
- "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+ "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.3",
- "@babel/parser": "^7.10.3",
- "@babel/types": "^7.10.3"
+ "@babel/code-frame": "^7.10.4",
+ "@babel/parser": "^7.10.4",
+ "@babel/types": "^7.10.4"
}
},
"@babel/traverse": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
- "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
+ "version": "7.11.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+ "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.3",
- "@babel/generator": "^7.10.3",
- "@babel/helper-function-name": "^7.10.3",
- "@babel/helper-split-export-declaration": "^7.10.1",
- "@babel/parser": "^7.10.3",
- "@babel/types": "^7.10.3",
+ "@babel/code-frame": "^7.10.4",
+ "@babel/generator": "^7.11.5",
+ "@babel/helper-function-name": "^7.10.4",
+ "@babel/helper-split-export-declaration": "^7.11.0",
+ "@babel/parser": "^7.11.5",
+ "@babel/types": "^7.11.5",
"debug": "^4.1.0",
"globals": "^11.1.0",
- "lodash": "^4.17.13"
+ "lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.10.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz",
- "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==",
+ "version": "7.11.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+ "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.3",
- "lodash": "^4.17.13",
+ "@babel/helper-validator-identifier": "^7.10.4",
+ "lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
},
@@ -276,9 +275,9 @@
}
},
"@primer/css": {
- "version": "15.1.0",
- "resolved": "https://registry.npmjs.org/@primer/css/-/css-15.1.0.tgz",
- "integrity": "sha512-UmmfjwA26FhOGBMuAfJQOBeRHz9YUcw7khPtifp7K+VyTDEhLnJPRTdApxtivH69vHTkSJ3rh/W1gWYolrLgVA==",
+ "version": "15.2.0",
+ "resolved": "https://registry.npmjs.org/@primer/css/-/css-15.2.0.tgz",
+ "integrity": "sha512-/vNDchWrxlXqd6E+SWQcChPHJVzGia9aCaTYoz8O9sJTnUSiTKOgSNCQuOXyUInPruTRSqj+z3MZxayKcTsWhA==",
"dev": true,
"requires": {
"@primer/octicons": "^9.1.1"
@@ -294,9 +293,9 @@
}
},
"@stylelint/postcss-css-in-js": {
- "version": "0.37.1",
- "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.1.tgz",
- "integrity": "sha512-UMf2Rni3JGKi3ZwYRGMYJ5ipOA5ENJSKMtYA/pE1ZLURwdh7B5+z2r73RmWvub+N0UuH1Lo+TGfCgYwPvqpXNw==",
+ "version": "0.37.2",
+ "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
+ "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
"dev": true,
"requires": {
"@babel/core": ">=7.9.0"
@@ -318,19 +317,12 @@
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
"dev": true
},
- "@types/events": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
- "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
- "dev": true
- },
"@types/glob": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
- "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+ "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
"dev": true,
"requires": {
- "@types/events": "*",
"@types/minimatch": "*",
"@types/node": "*"
}
@@ -348,9 +340,9 @@
"dev": true
},
"@types/node": {
- "version": "12.0.7",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.7.tgz",
- "integrity": "sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==",
+ "version": "14.11.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz",
+ "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==",
"dev": true
},
"@types/normalize-package-data": {
@@ -511,9 +503,9 @@
"dev": true
},
"astral-regex": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
- "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
"dev": true
},
"atob": {
@@ -523,14 +515,14 @@
"dev": true
},
"autoprefixer": {
- "version": "9.8.3",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.3.tgz",
- "integrity": "sha512-Y3CkEPqPqGw0TNBcMoUAxeZT9WEOAh0BPYENOTrN/bEfNBqjlYWjHbR1PKduBrmAVn8WbEZtMA3gAZO5MgV7Pg==",
+ "version": "9.8.6",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+ "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
"dev": true,
"requires": {
"browserslist": "^4.12.0",
- "caniuse-lite": "^1.0.30001087",
- "kleur": "^4.0.1",
+ "caniuse-lite": "^1.0.30001109",
+ "colorette": "^1.2.1",
"normalize-range": "^0.1.2",
"num2fraction": "^1.2.2",
"postcss": "^7.0.32",
@@ -538,39 +530,39 @@
},
"dependencies": {
"browserslist": {
- "version": "4.12.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
- "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+ "version": "4.14.5",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+ "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30001043",
- "electron-to-chromium": "^1.3.413",
- "node-releases": "^1.1.53",
- "pkg-up": "^2.0.0"
+ "caniuse-lite": "^1.0.30001135",
+ "electron-to-chromium": "^1.3.571",
+ "escalade": "^3.1.0",
+ "node-releases": "^1.1.61"
}
},
"caniuse-lite": {
- "version": "1.0.30001087",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz",
- "integrity": "sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==",
+ "version": "1.0.30001137",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz",
+ "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==",
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.481",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz",
- "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==",
+ "version": "1.3.573",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.573.tgz",
+ "integrity": "sha512-oypaNmexr8w0m2GX67fGLQ0Xgsd7uXz7GcwaHZ9eW3ZdQ8uA2+V/wXmLdMTk3gcacbqQGAN7CXWG3fOkfKYftw==",
"dev": true
},
"node-releases": {
- "version": "1.1.58",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
- "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
+ "version": "1.1.61",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+ "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
"dev": true
},
"postcss": {
- "version": "7.0.32",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
- "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+ "version": "7.0.34",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
+ "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -693,20 +685,21 @@
}
},
"browserslist": {
- "version": "4.7.2",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.2.tgz",
- "integrity": "sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==",
+ "version": "4.14.5",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+ "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30001004",
- "electron-to-chromium": "^1.3.295",
- "node-releases": "^1.1.38"
+ "caniuse-lite": "^1.0.30001135",
+ "electron-to-chromium": "^1.3.571",
+ "escalade": "^3.1.0",
+ "node-releases": "^1.1.61"
},
"dependencies": {
"electron-to-chromium": {
- "version": "1.3.296",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz",
- "integrity": "sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==",
+ "version": "1.3.576",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz",
+ "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==",
"dev": true
}
}
@@ -741,9 +734,9 @@
"dev": true
},
"camelcase": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
- "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
"camelcase-keys": {
@@ -755,14 +748,6 @@
"camelcase": "^5.3.1",
"map-obj": "^4.0.0",
"quick-lru": "^4.0.1"
- },
- "dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
- }
}
},
"caniuse-db": {
@@ -772,9 +757,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001006",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz",
- "integrity": "sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==",
+ "version": "1.0.30001142",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz",
+ "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==",
"dev": true
},
"ccount": {
@@ -955,6 +940,12 @@
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
},
+ "colorette": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
+ "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
+ "dev": true
+ },
"colorguard": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.1.tgz",
@@ -1111,16 +1102,16 @@
"dev": true
},
"cosmiconfig": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
- "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+ "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
"dev": true,
"requires": {
"@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
+ "import-fresh": "^3.2.1",
"parse-json": "^5.0.0",
"path-type": "^4.0.0",
- "yaml": "^1.7.2"
+ "yaml": "^1.10.0"
},
"dependencies": {
"path-type": {
@@ -1250,12 +1241,12 @@
}
},
"debug": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
- "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+ "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
"dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"decamelize": {
@@ -1385,9 +1376,9 @@
},
"dependencies": {
"domelementtype": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
- "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+ "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
"dev": true
},
"entities": {
@@ -1501,27 +1492,28 @@
}
},
"es-abstract": {
- "version": "1.16.0",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
- "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+ "version": "1.17.7",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
"dev": true,
"requires": {
- "es-to-primitive": "^1.2.0",
+ "es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"has": "^1.0.3",
- "has-symbols": "^1.0.0",
- "is-callable": "^1.1.4",
- "is-regex": "^1.0.4",
- "object-inspect": "^1.6.0",
+ "has-symbols": "^1.0.1",
+ "is-callable": "^1.2.2",
+ "is-regex": "^1.1.1",
+ "object-inspect": "^1.8.0",
"object-keys": "^1.1.1",
- "string.prototype.trimleft": "^2.1.0",
- "string.prototype.trimright": "^2.1.0"
+ "object.assign": "^4.1.1",
+ "string.prototype.trimend": "^1.0.1",
+ "string.prototype.trimstart": "^1.0.1"
}
},
"es-to-primitive": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
- "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
"dev": true,
"requires": {
"is-callable": "^1.1.4",
@@ -1529,6 +1521,12 @@
"is-symbol": "^1.0.2"
}
},
+ "escalade": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
+ "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
+ "dev": true
+ },
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1813,6 +1811,12 @@
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
"dev": true
},
+ "fastest-levenshtein": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+ "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+ "dev": true
+ },
"fastq": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
@@ -1861,12 +1865,21 @@
}
},
"find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dev": true,
"requires": {
- "locate-path": "^2.0.0"
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "dependencies": {
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ }
}
},
"flat-cache": {
@@ -2168,9 +2181,9 @@
"dev": true
},
"has-symbols": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
- "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
},
"has-value": {
@@ -2368,9 +2381,9 @@
"dev": true
},
"is-callable": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
- "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+ "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
"dev": true
},
"is-data-descriptor": {
@@ -2394,9 +2407,9 @@
}
},
"is-date-object": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
- "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+ "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
"dev": true
},
"is-decimal": {
@@ -2487,6 +2500,12 @@
"integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
"dev": true
},
+ "is-negative-zero": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+ "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+ "dev": true
+ },
"is-number": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2535,12 +2554,12 @@
"dev": true
},
"is-regex": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
- "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+ "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
"dev": true,
"requires": {
- "has": "^1.0.1"
+ "has-symbols": "^1.0.1"
}
},
"is-regexp": {
@@ -2562,12 +2581,12 @@
"dev": true
},
"is-symbol": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
- "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
"dev": true,
"requires": {
- "has-symbols": "^1.0.0"
+ "has-symbols": "^1.0.1"
}
},
"is-typedarray": {
@@ -2646,10 +2665,10 @@
"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
"dev": true
},
- "json-parse-better-errors": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
- "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+ "json-parse-even-better-errors": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
"dev": true
},
"json-schema-traverse": {
@@ -2741,12 +2760,6 @@
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true
},
- "kleur": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.0.1.tgz",
- "integrity": "sha512-Qs6SqCLm63rd0kNVh+wO4XsWLU6kgfwwaPYsLiClWf0Tewkzsa6MvB21bespb8cz+ANS+2t3So1ge3gintzhlw==",
- "dev": true
- },
"known-css-properties": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz",
@@ -2808,12 +2821,6 @@
}
}
},
- "leven": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
- "dev": true
- },
"lines-and-columns": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -2821,13 +2828,12 @@
"dev": true
},
"locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dev": true,
"requires": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
+ "p-locate": "^4.1.0"
}
},
"lodash": {
@@ -2887,9 +2893,9 @@
"dev": true
},
"supports-color": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
- "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
@@ -2991,38 +2997,28 @@
}
},
"meow": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz",
- "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
+ "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
"dev": true,
"requires": {
"@types/minimist": "^1.2.0",
- "arrify": "^2.0.1",
- "camelcase": "^6.0.0",
"camelcase-keys": "^6.2.2",
"decamelize-keys": "^1.1.0",
"hard-rejection": "^2.1.0",
- "minimist-options": "^4.0.2",
+ "minimist-options": "4.1.0",
"normalize-package-data": "^2.5.0",
"read-pkg-up": "^7.0.1",
"redent": "^3.0.0",
"trim-newlines": "^3.0.0",
"type-fest": "^0.13.1",
"yargs-parser": "^18.1.3"
- },
- "dependencies": {
- "arrify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
- "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
- "dev": true
- }
}
},
"merge2": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz",
- "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
"dev": true
},
"micromatch": {
@@ -3196,21 +3192,10 @@
"dev": true
},
"node-releases": {
- "version": "1.1.39",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz",
- "integrity": "sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==",
- "dev": true,
- "requires": {
- "semver": "^6.3.0"
- },
- "dependencies": {
- "semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
- }
- }
+ "version": "1.1.61",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
+ "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
+ "dev": true
},
"normalize-package-data": {
"version": "2.5.0",
@@ -3304,9 +3289,9 @@
}
},
"object-inspect": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
- "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+ "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
"dev": true
},
"object-keys": {
@@ -3324,6 +3309,40 @@
"isobject": "^3.0.0"
}
},
+ "object.assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.18.0-next.0",
+ "has-symbols": "^1.0.1",
+ "object-keys": "^1.1.1"
+ },
+ "dependencies": {
+ "es-abstract": {
+ "version": "1.18.0-next.1",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+ "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "^1.2.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.1",
+ "is-callable": "^1.2.2",
+ "is-negative-zero": "^2.0.0",
+ "is-regex": "^1.1.1",
+ "object-inspect": "^1.8.0",
+ "object-keys": "^1.1.1",
+ "object.assign": "^4.1.1",
+ "string.prototype.trimend": "^1.0.1",
+ "string.prototype.trimstart": "^1.0.1"
+ }
+ }
+ }
+ },
"object.omit": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
@@ -3394,27 +3413,27 @@
"dev": true
},
"p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
- "p-try": "^1.0.0"
+ "p-try": "^2.0.0"
}
},
"p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"dev": true,
"requires": {
- "p-limit": "^1.1.0"
+ "p-limit": "^2.2.0"
}
},
"p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
"parent-module": {
@@ -3470,14 +3489,14 @@
}
},
"parse-json": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
- "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+ "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"error-ex": "^1.3.1",
- "json-parse-better-errors": "^1.0.1",
+ "json-parse-even-better-errors": "^2.3.0",
"lines-and-columns": "^1.1.6"
}
},
@@ -3571,15 +3590,6 @@
"synesthesia": "^1.0.1"
}
},
- "pkg-up": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
- "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
- "dev": true,
- "requires": {
- "find-up": "^2.1.0"
- }
- },
"plur": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -3630,29 +3640,6 @@
"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
"dev": true
},
- "postcss-reporter": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz",
- "integrity": "sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==",
- "dev": true,
- "requires": {
- "chalk": "^2.4.1",
- "lodash": "^4.17.11",
- "log-symbols": "^2.2.0",
- "postcss": "^7.0.7"
- },
- "dependencies": {
- "log-symbols": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
- "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
- "dev": true,
- "requires": {
- "chalk": "^2.0.1"
- }
- }
- }
- },
"postcss-resolve-nested-selector": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
@@ -3669,9 +3656,9 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.32",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
- "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+ "version": "7.0.34",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
+ "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -3692,9 +3679,9 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.32",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
- "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+ "version": "7.0.34",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
+ "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -3714,14 +3701,15 @@
}
},
"postcss-selector-parser": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
- "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+ "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
"dev": true,
"requires": {
"cssesc": "^3.0.0",
"indexes-of": "^1.0.1",
- "uniq": "^1.0.1"
+ "uniq": "^1.0.1",
+ "util-deprecate": "^1.0.2"
}
},
"postcss-sorting": {
@@ -3753,9 +3741,9 @@
"dev": true
},
"prettier": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
- "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
+ "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
"dev": true
},
"prettier-linter-helpers": {
@@ -3854,55 +3842,6 @@
"type-fest": "^0.8.1"
},
"dependencies": {
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dev": true,
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dev": true,
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dev": true,
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dev": true,
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "dev": true
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true
- },
"type-fest": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -3952,18 +3891,19 @@
}
},
"regexp.prototype.flags": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
- "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+ "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
"dev": true,
"requires": {
- "define-properties": "^1.1.2"
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.0-next.1"
}
},
"remark": {
- "version": "12.0.0",
- "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.0.tgz",
- "integrity": "sha512-oX4lMIS0csgk8AEbzY0h2jdR0ngiCHOpwwpxjmRa5TqAkeknY+tkhjRJGZqnCmvyuWh55/0SW5WY3R3nn3PH9A==",
+ "version": "12.0.1",
+ "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
+ "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
"dev": true,
"requires": {
"remark-parse": "^8.0.0",
@@ -3972,9 +3912,9 @@
}
},
"remark-parse": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz",
- "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==",
+ "version": "8.0.3",
+ "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
+ "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
"dev": true,
"requires": {
"ccount": "^1.0.0",
@@ -3996,9 +3936,9 @@
}
},
"remark-stringify": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.0.tgz",
- "integrity": "sha512-FSPZv1ds76oAZjurhhuV5qXSUSoz6QRPuwYK38S41sLHwg4oB7ejnmZshj7qwjgYLf93kdz6BOX9j5aidNE7rA==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
+ "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
"dev": true,
"requires": {
"ccount": "^1.0.0",
@@ -4144,9 +4084,9 @@
"dev": true
},
"set-value": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
"dev": true,
"requires": {
"extend-shallow": "^2.0.1",
@@ -4194,20 +4134,39 @@
"dev": true
},
"slice-ansi": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
- "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "astral-regex": "^1.0.0",
- "is-fullwidth-code-point": "^2.0.0"
+ "ansi-styles": "^4.0.0",
+ "astral-regex": "^2.0.0",
+ "is-fullwidth-code-point": "^3.0.0"
},
"dependencies": {
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
}
}
@@ -4347,12 +4306,12 @@
"dev": true
},
"source-map-resolve": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
- "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
"dev": true,
"requires": {
- "atob": "^2.1.1",
+ "atob": "^2.1.2",
"decode-uri-component": "^0.2.0",
"resolve-url": "^0.2.1",
"source-map-url": "^0.4.0",
@@ -4524,24 +4483,24 @@
"regexp.prototype.flags": "^1.2.0"
}
},
- "string.prototype.trimleft": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
- "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+ "string.prototype.trimend": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
+ "es-abstract": "^1.17.5"
}
},
- "string.prototype.trimright": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
- "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+ "string.prototype.trimstart": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
+ "es-abstract": "^1.17.5"
}
},
"string_decoder": {
@@ -4749,19 +4708,21 @@
}
},
"stylelint": {
- "version": "13.6.1",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.6.1.tgz",
- "integrity": "sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==",
+ "version": "13.7.2",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz",
+ "integrity": "sha512-mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==",
"dev": true,
"requires": {
- "@stylelint/postcss-css-in-js": "^0.37.1",
+ "@stylelint/postcss-css-in-js": "^0.37.2",
"@stylelint/postcss-markdown": "^0.36.1",
- "autoprefixer": "^9.8.0",
+ "autoprefixer": "^9.8.6",
"balanced-match": "^1.0.0",
"chalk": "^4.1.0",
- "cosmiconfig": "^6.0.0",
+ "cosmiconfig": "^7.0.0",
"debug": "^4.1.1",
"execall": "^2.0.0",
+ "fast-glob": "^3.2.4",
+ "fastest-levenshtein": "^1.0.12",
"file-entry-cache": "^5.0.1",
"get-stdin": "^8.0.0",
"global-modules": "^2.0.0",
@@ -4772,18 +4733,16 @@
"import-lazy": "^4.0.0",
"imurmurhash": "^0.1.4",
"known-css-properties": "^0.19.0",
- "leven": "^3.1.0",
- "lodash": "^4.17.15",
+ "lodash": "^4.17.20",
"log-symbols": "^4.0.0",
"mathml-tag-names": "^2.1.3",
- "meow": "^7.0.1",
+ "meow": "^7.1.1",
"micromatch": "^4.0.2",
"normalize-selector": "^0.2.0",
"postcss": "^7.0.32",
"postcss-html": "^0.36.0",
"postcss-less": "^3.1.4",
"postcss-media-query-parser": "^0.2.3",
- "postcss-reporter": "^6.0.1",
"postcss-resolve-nested-selector": "^0.1.1",
"postcss-safe-parser": "^4.0.2",
"postcss-sass": "^0.4.4",
@@ -4799,7 +4758,7 @@
"style-search": "^0.1.0",
"sugarss": "^2.0.0",
"svg-tags": "^1.0.0",
- "table": "^5.4.6",
+ "table": "^6.0.1",
"v8-compile-cache": "^2.1.1",
"write-file-atomic": "^3.0.3"
},
@@ -4933,6 +4892,12 @@
"integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+ "dev": true
+ },
"mathml-tag-names": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -4958,9 +4923,9 @@
"dev": true
},
"postcss": {
- "version": "7.0.32",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
- "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+ "version": "7.0.34",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
+ "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -5038,9 +5003,9 @@
"dev": true
},
"supports-color": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
- "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
@@ -5055,9 +5020,9 @@
"dev": true
},
"stylelint-config-primer": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/stylelint-config-primer/-/stylelint-config-primer-9.0.0.tgz",
- "integrity": "sha512-jM/D1qB33wMb6Q19iWHDfowB9Sb4LwbR4wtCWz9qeZIapGJ1nclVxJ63HgDherzXl1Im2pXa69RdOX51trrR0Q==",
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/stylelint-config-primer/-/stylelint-config-primer-9.2.1.tgz",
+ "integrity": "sha512-4tpNgAZosmONtVmWKwufdiagEsR2He4j17tn0MtX9NdtSWKfeANrJsUeEFr2WDJR+YuAOSVwytQIP55u5reSEw==",
"dev": true,
"requires": {
"anymatch": "^3.1.1",
@@ -5071,9 +5036,9 @@
},
"dependencies": {
"postcss-value-parser": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
- "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
"dev": true
}
}
@@ -5133,33 +5098,22 @@
}
},
"stylelint-scss": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.12.0.tgz",
- "integrity": "sha512-RvZqmCnILJ0etFBjSGTXQKOspYjF+jjtFdUGoqjuis2YILy/3LCtgSdBP2I+LUOfRT+eJFCrb8g+j3ZND4FaNA==",
+ "version": "3.18.0",
+ "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.18.0.tgz",
+ "integrity": "sha512-LD7+hv/6/ApNGt7+nR/50ft7cezKP2HM5rI8avIdGaUWre3xlHfV4jKO/DRZhscfuN+Ewy9FMhcTq0CcS0C/SA==",
"dev": true,
"requires": {
"lodash": "^4.17.15",
"postcss-media-query-parser": "^0.2.3",
"postcss-resolve-nested-selector": "^0.1.1",
"postcss-selector-parser": "^6.0.2",
- "postcss-value-parser": "^4.0.2"
+ "postcss-value-parser": "^4.1.0"
},
"dependencies": {
- "postcss-selector-parser": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
- "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
- "dev": true,
- "requires": {
- "cssesc": "^3.0.0",
- "indexes-of": "^1.0.1",
- "uniq": "^1.0.1"
- }
- },
"postcss-value-parser": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
- "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
"dev": true
}
}
@@ -6053,21 +6007,21 @@
}
},
"table": {
- "version": "5.4.6",
- "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
- "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/table/-/table-6.0.3.tgz",
+ "integrity": "sha512-8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==",
"dev": true,
"requires": {
- "ajv": "^6.10.2",
- "lodash": "^4.17.14",
- "slice-ansi": "^2.1.0",
- "string-width": "^3.0.0"
+ "ajv": "^6.12.4",
+ "lodash": "^4.17.20",
+ "slice-ansi": "^4.0.0",
+ "string-width": "^4.2.0"
},
"dependencies": {
"ajv": {
- "version": "6.12.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
- "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+ "version": "6.12.5",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -6076,49 +6030,17 @@
"uri-js": "^4.2.2"
}
},
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
- },
- "emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "lodash": {
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
"dev": true
- },
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
}
}
},
@@ -6151,9 +6073,9 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -6274,9 +6196,9 @@
}
},
"unified": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz",
- "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==",
+ "version": "9.2.0",
+ "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
+ "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
"dev": true,
"requires": {
"bail": "^1.0.0",
@@ -6296,38 +6218,15 @@
}
},
"union-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
- "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
"dev": true,
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
"is-extendable": "^0.1.1",
- "set-value": "^0.4.3"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "set-value": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
- "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
- "dev": true,
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.1",
- "to-object-path": "^0.3.0"
- }
- }
+ "set-value": "^2.0.1"
}
},
"uniq": {
@@ -6370,9 +6269,9 @@
}
},
"unist-util-visit": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.2.tgz",
- "integrity": "sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+ "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
"dev": true,
"requires": {
"@types/unist": "^2.0.0",
@@ -6381,9 +6280,9 @@
}
},
"unist-util-visit-parents": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.0.2.tgz",
- "integrity": "sha512-yJEfuZtzFpQmg1OSCyS9M5NJRrln/9FbYosH3iW0MG402QbdbaB8ZESwUv9RO6nRfLAKvWcMxCwdLWOov36x/g==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz",
+ "integrity": "sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==",
"dev": true,
"requires": {
"@types/unist": "^2.0.0",
@@ -6474,9 +6373,9 @@
}
},
"vfile": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz",
- "integrity": "sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz",
+ "integrity": "sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==",
"dev": true,
"requires": {
"@types/unist": "^2.0.0",
@@ -6495,9 +6394,9 @@
}
},
"vfile-location": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz",
- "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz",
+ "integrity": "sha512-FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g==",
"dev": true
},
"vfile-message": {
@@ -6687,9 +6586,9 @@
}
},
"p-limit": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
- "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -6749,14 +6648,6 @@
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
- }
}
}
}
diff --git a/package.json b/package.json
index 0dbeaf26b3414eee3fa24f75fbcf04d739bd57d8..fd320cc7d52ee2d086f319ce4453e15a886e5766 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
{
"name": "just-the-docs",
- "version": "0.3.1",
+ "version": "0.3.3",
"description": "A modern Jekyll theme for documentation",
- "repository": "pmarsceill/just-the-docs",
+ "repository": "just-the-docs/just-the-docs",
"license": "MIT",
- "bugs": "https://github.com/pmarsceill/just-the-docs/issues",
+ "bugs": "https://github.com/just-the-docs/just-the-docs/issues",
"devDependencies": {
- "@primer/css": "^15.1.0",
- "prettier": "^2.0.5",
- "stylelint": "^13.6.1",
+ "stylelint": "^13.7.2",
+ "@primer/css": "^15.2.0",
+ "prettier": "^2.1.2",
"stylelint-config-prettier": "^8.0.2",
- "stylelint-config-primer": "^9.0.0",
+ "stylelint-config-primer": "^9.2.1",
"stylelint-prettier": "^1.1.2",
"stylelint-selector-no-utility": "^4.0.0"
},