Merge branch 'develop' into config-dir-659

# Conflicts:
#	CHANGELOG.md

.github/workflows/changelog.yaml

@@ -98,7 +98,7 @@ jobs:
           repo: jrnl-org/jrnl
           token: ${{ secrets.JRNL_BOT_TOKEN }}
           base: CHANGELOG.md
-          addSections: '{"build":{"prefix":"**Build:**","labels":["build"]},"docs":{"prefix":"**Documentation:**","labels":["documentation"]}}'
+          addSections: '{"build":{"prefix":"**Build:**","labels":["build"]},"docs":{"prefix":"**Documentation:**","labels":["documentation"]},"packaging":{"prefix":"**Packaging:**","labels":["packaging"]}}'
           issues: true
           pullRequests: true
           issuesWoLabels: false

CHANGELOG.md

@@ -14,6 +14,8 @@
 
 **Documentation:**
 
+- Fix search on docs site [\#1133](https://github.com/jrnl-org/jrnl/pull/1133) ([wren](https://github.com/wren))
+- Add packaging label to changelog generator config [\#1132](https://github.com/jrnl-org/jrnl/pull/1132) ([wren](https://github.com/wren))
 - Fix failing contrast test in accessibility tools on docs site [\#1126](https://github.com/jrnl-org/jrnl/pull/1126) ([wren](https://github.com/wren))
 
 ## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20)

docs_theme/main.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block search_button %}
-<form class="mkdocs-search" action="search.html">
+<form class="mkdocs-search" action="{{ base_url }}/search.html">
   <input type="text" name="q" placeholder="Search docs" title="Type search term here">
   <button class="icon icon-search" aria-label="submit"></button>
 </form>