diff --git a/CHANGELOG b/CHANGELOG index 5dec18cf742cc471a0dc105879fd7fad93bf5518..5b725aaaa1903918b5ad7e57ed691ddbb50dc997 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 d797f0f6480d3d5169e8fbb08f0aa6878a77eaf1..31935601f6587c8e1de00d073b224f356d43e4f0 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 63d96ab60f9b5780b4996f4701a4583f1810bfb2..3b3ca9f0c8028779f7c9d522b89ee89c9bad5386 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 <small>_ October 20, 2017</small> + +* 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 <small>_ October 19, 2017</small> * Added localization to clipboard diff --git a/material/base.html b/material/base.html index e8b7b0e8b2978e8261e47a45eea33c6dfdc1d0b1..e6dade71984af304cc281915c2665ce20cec4fc4 100644 --- a/material/base.html +++ b/material/base.html @@ -35,7 +35,7 @@ {% else %} <link rel="shortcut icon" href="{{ base_url }}/assets/images/favicon.png"> {% endif %} - <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.11.0"> + <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.12.0"> {% endblock %} {% block htmltitle %} {% if page and page.meta.title %} diff --git a/mkdocs.yml b/mkdocs.yml index 9c77ebdcb7fdb52bfc91bf4f7d46e535bc537d54..66921625c2b281205e20bbe3c0b6b27d261b503a 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 5890801b250de248fa5c4b30277c138050d6d7ae..27a5c43ea8c70fd7e18f565ad747c64e2f12af03 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 d1a670fcc8371284073fdc27f109a91387b29ef1..a9f32d4e8d66b44dd505adca0a2485a392a7adde 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 c637da6be5bb0872b4b311d46bc37f3a000bb422..ecce0bb12499f89a870794ac9312735fa8eda355 100644 --- a/src/partials/language/da.html +++ b/src/partials/language/da.html @@ -20,7 +20,7 @@ IN THE SOFTWARE. --> -<!-- Translations: English --> +<!-- Translations: Danish --> {% macro t(key) %}{{ { "language": "da", "clipboard.copy": "KopiƩr til udklipsholderen",