From 631846394e4eaabb5b68a4797a93756a59b1f1a6 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Fri, 17 May 2019 21:52:14 +0200 Subject: [PATCH] Prepare 4.3.0 release --- CHANGELOG | 7 +++++++ docs/release-notes.md | 7 +++++++ material/base.html | 4 ++-- package.json | 2 +- src/base.html | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 842679afc..bb8652eda 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +mkdocs-material-4.3.0 (2019-05-17) + + * Added support for changing header through metadata title property + * Added font-display: swap to Google Font loading logic + * Removed whitespace from templates, saving 4kb (.7kb gzipped) per request + * Fixed alignment of repository icons on tablet and desktop + mkdocs-material-4.2.0 (2019-04-28) * Added Norwegian (Nynorsk) translations diff --git a/docs/release-notes.md b/docs/release-notes.md index f7e114b13..40b064c52 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -64,6 +64,13 @@ pip show mkdocs-material ## Changelog +### 4.3.0 _ May 17, 2019 + +* Added support for changing header through metadata title property +* Added `font-display: swap` to Google Font loading logic +* Removed whitespace from templates, saving `4kb` (`.7kb` gzipped) per request +* Fixed alignment of repository icons on tablet and desktop + ### 4.2.0 _ April 28, 2019 * Added Norwegian (Nynorsk) translations diff --git a/material/base.html b/material/base.html index 6566cce42..40bc7b5f2 100644 --- a/material/base.html +++ b/material/base.html @@ -1,7 +1,7 @@ {#- This file was automatically generated - do not edit -#} -{%- import "partials/language.html" as lang with context -%} {%- set feature = config.theme.feature -%} {%- set palette = config.theme.palette -%} {%- set font = config.theme.font -%}{%- block site_meta -%}{%- if page and page.meta and page.meta.description -%}{%- elif config.site_description -%}{%- endif -%} {%- if page and page.meta and page.meta.redirect -%}{%- elif page.canonical_url -%}{%- endif -%} {%- if page and page.meta and page.meta.author -%}{%- elif config.site_author -%}{%- endif -%} {%- for key in [ "clipboard.copy", "clipboard.copied", "search.language", "search.pipeline.stopwords", "search.pipeline.trimmer", "search.result.none", "search.result.one", "search.result.other", "search.tokenizer" ] -%}{%- endfor -%}{%- endblock -%} {%- block htmltitle -%} {%- if page and page.meta and page.meta.title -%}{{ page.meta.title }}{%- elif page and page.title and not page.is_homepage -%}{{ page.title }} - {{ config.site_name }}{%- else -%}{{ config.site_name }}{%- endif -%} {%- endblock -%} {%- block styles -%}{%- if palette.primary or palette.accent -%}{%- endif -%} {%- if palette.primary -%} {%- import "partials/palette.html" as map -%} {%- set primary = map.primary( palette.primary | replace(" ", "-") | lower ) -%}{%- endif -%} {%- endblock -%} {%- block libs -%}{%- endblock -%} {%- block fonts -%} {%- if font != false -%}{%- block site_meta -%}{%- if page and page.meta and page.meta.description -%}{%- elif config.site_description -%}{%- endif -%} {%- if page and page.meta and page.meta.redirect -%}{%- elif page.canonical_url -%}{%- endif -%} {%- if page and page.meta and page.meta.author -%}{%- elif config.site_author -%}{%- endif -%} {%- for key in [ "clipboard.copy", "clipboard.copied", "search.language", "search.pipeline.stopwords", "search.pipeline.trimmer", "search.result.none", "search.result.one", "search.result.other", "search.tokenizer" ] -%}{%- endfor -%}{%- endblock -%} {%- block htmltitle -%} {%- if page and page.meta and page.meta.title -%}{{ page.meta.title }}{%- elif page and page.title and not page.is_homepage -%}{{ page.title }} - {{ config.site_name }}{%- else -%}{{ config.site_name }}{%- endif -%} {%- endblock -%} {%- block styles -%}{%- if palette.primary or palette.accent -%}{%- endif -%} {%- if palette.primary -%} {%- import "partials/palette.html" as map -%} {%- set primary = map.primary( palette.primary | replace(" ", "-") | lower ) -%}{%- endif -%} {%- endblock -%} {%- block libs -%}{%- endblock -%} {%- block fonts -%} {%- if font != false -%}{%- endif -%} {%- endblock -%}{%- if config.extra.manifest -%}{%- endif -%} {%- for path in config["extra_css"] -%}{%- endfor -%} {%- block analytics -%} {%- if config.google_analytics -%} {%- include "partials/integrations/analytics.html" -%} {%- endif -%} {%- endblock -%} {%- block extrahead -%}{%- endblock -%}{%- if palette.primary or palette.accent -%} {%- set primary = palette.primary | replace(" ", "-") | lower -%} {%- set accent = palette.accent | replace(" ", "-") | lower -%}{%- else -%}{%- endif -%} {%- set platform = config.extra.repo_icon or config.repo_url -%} {%- if "github" in platform -%} {%- include "assets/images/icons/github.f0b8504a.svg" -%} {%- elif "gitlab" in platform -%} {%- include "assets/images/icons/gitlab.6dd19c00.svg" -%} {%- elif "bitbucket" in platform -%} {%- include "assets/images/icons/bitbucket.1b09e088.svg" -%} {%- endif -%} {%- if page.toc | first is defined -%} {{ lang.t('skip.link.title') }} {%- endif -%} {%- block header -%} {%- include "partials/header.html" -%} {%- endblock -%}
{%- block hero -%} {%- if page and page.meta and page.meta.hero -%} {%- include "partials/hero.html" with context -%} {%- endif -%} {%- endblock -%} {%- if feature.tabs -%} {%- include "partials/tabs.html" -%} {%- endif -%}
{%- block site_nav -%} {%- if nav -%}
{%- include "partials/nav.html" -%}
{%- endif -%} {%- if page.toc -%}
{%- include "partials/toc.html" -%}
{%- endif -%} {%- endblock -%}
{%- block content -%} {%- if page.edit_url -%} {%- endif -%} {%- if not "\x3ch1" in page.content -%}

{{ page.title | default(config.site_name, true)}}

{%- endif -%} {{ page.content }} {%- block source -%} {%- if page and page.meta and page.meta.source -%}

{{ lang.t("meta.source") }}

{%- set repo = config.repo_url -%} {%- if repo | last == "/" -%} {%- set repo = repo[:-1] -%} {%- endif -%} {%- set path = page.meta.path | default([""]) -%} {%- set file = page.meta.source -%} {{ file }} {%- endif -%} {%- endblock -%} {%- endblock -%} {%- block disqus -%} {%- include "partials/integrations/disqus.html" -%} {%- endblock -%}
{%- block footer -%} {%- include "partials/footer.html" -%} {%- endblock -%}
{%- block scripts -%}{%- if lang.t("search.language") != "en" -%} {%- set languages = lang.t("search.language").split(",") -%} {%- if languages | length and languages[0] != "" -%} {%- set path = "assets/javascripts/lunr/" -%}{%- for language in languages | map("trim") -%} {%- if language != "en" -%} {%- if language == "ja" -%}{%- endif -%} {%- if language in ("da", "de", "es", "fi", "fr", "hu", "it", "ja", "nl", "no", "pt", "ro", "ru", "sv", "th", "tr") -%}{%- endif -%} {%- endif -%} {%- endfor -%} {%- if languages | length > 1 -%}{%- endif -%} {%- endif -%} {%- endif -%}{%- for path in config["extra_javascript"] -%}{%- endfor -%} {%- endblock -%} \ No newline at end of file diff --git a/package.json b/package.json index 27176a927..58d52cf3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mkdocs-material", - "version": "4.2.0", + "version": "4.3.0", "description": "A Material Design theme for MkDocs", "keywords": [ "mkdocs", diff --git a/src/base.html b/src/base.html index 3c8469e5e..a16ae1d9c 100644 --- a/src/base.html +++ b/src/base.html @@ -143,7 +143,7 @@