From b8b245a1b8d86f4b0fcaf1cecf523d006ab56af3 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Fri, 20 Oct 2017 09:37:18 +0200 Subject: [PATCH] Prepare 1.12.0 release --- CHANGELOG | 5 +++-- docs/getting-started.md | 2 +- docs/release-notes.md | 11 ++++++++++- material/base.html | 2 +- mkdocs.yml | 12 ++++++++---- package.json | 2 +- requirements.txt | 4 ++-- src/partials/language/da.html | 2 +- 8 files changed, 27 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5dec18cf7..5b725aaaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,8 @@ -master +mkdocs-material-1.12.0 (2017-10-20) * Added support for setting language(s) via mkdocs.yml - * Added support for default localization and German translations + * Added support for default localization + * Added German and Danish translations * Fixed #374: Search bar misalignment on big screens mkdocs-material-1.11.0 (2017-10-19) diff --git a/docs/getting-started.md b/docs/getting-started.md index d797f0f64..31935601f 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -6,7 +6,7 @@ The official [Docker image][1] for Material comes with all dependencies pre-installed and ready-to-use with the latest version published on PyPI, - packaged in a very small image (23MB compressed). + packaged in a very small image (35MB compressed). [1]: https://hub.docker.com/r/squidfunk/mkdocs-material/ diff --git a/docs/release-notes.md b/docs/release-notes.md index 63d96ab60..3b3ca9f0c 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -12,11 +12,20 @@ To determine the currently installed version, use the following command: ``` sh pip show mkdocs-material | grep -E ^Version -# Version 1.11.0 +# Version 1.12.0 ``` ## Changelog +### 1.12.0 _ October 20, 2017 + +* Added support for setting language(s) via `mkdocs.yml` +* Added support for default localization +* Added German and Danish translations +* Fixed [#374][374]: Search bar misalignment on big screens + + [374]: https://github.com/squidfunk/mkdocs-material/issues/374 + ### 1.11.0 _ October 19, 2017 * Added localization to clipboard diff --git a/material/base.html b/material/base.html index e8b7b0e8b..e6dade719 100644 --- a/material/base.html +++ b/material/base.html @@ -35,7 +35,7 @@ {% else %} {% endif %} - + {% endblock %} {% block htmltitle %} {% if page and page.meta.title %} diff --git a/mkdocs.yml b/mkdocs.yml index 9c77ebdcb..66921625c 100755 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -55,13 +55,16 @@ extra: # Extensions markdown_extensions: - markdown.extensions.admonition - - markdown.extensions.codehilite(guess_lang=false) + - markdown.extensions.codehilite: + guess_lang: false - markdown.extensions.def_list - markdown.extensions.footnotes - markdown.extensions.meta - - markdown.extensions.toc(permalink=true) + - markdown.extensions.toc: + permalink: true - pymdownx.arithmatex - - pymdownx.betterem(smart_enable=all) + - pymdownx.betterem: + smart_enable: all - pymdownx.caret - pymdownx.critic - pymdownx.details @@ -72,7 +75,8 @@ markdown_extensions: - pymdownx.mark - pymdownx.smartsymbols - pymdownx.superfences - - pymdownx.tasklist(custom_checkbox=true) + - pymdownx.tasklist: + custom_checkbox: true - pymdownx.tilde # Page tree diff --git a/package.json b/package.json index 5890801b2..27a5c43ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mkdocs-material", - "version": "1.11.0", + "version": "1.12.0", "description": "A Material Design theme for MkDocs", "keywords": [ "mkdocs", diff --git a/requirements.txt b/requirements.txt index d1a670fcc..a9f32d4e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -mkdocs>=0.16 -pygments>=2.2 +mkdocs==0.16.3 +Pygments>=2.2 pymdown-extensions>=3.4 diff --git a/src/partials/language/da.html b/src/partials/language/da.html index c637da6be..ecce0bb12 100644 --- a/src/partials/language/da.html +++ b/src/partials/language/da.html @@ -20,7 +20,7 @@ IN THE SOFTWARE. --> - + {% macro t(key) %}{{ { "language": "da", "clipboard.copy": "KopiƩr til udklipsholderen",