From 1d0e2f16fead40fbdb80b9ed68c1b3cbbfc8d36b Mon Sep 17 00:00:00 2001
From: Marek Chrastina <marek.chrastina@vsb.cz>
Date: Wed, 29 Apr 2020 09:22:04 +0200
Subject: [PATCH] Upgrade to mkdocs-material 5.x
---
.gitlab-ci.yml | 2 +-
material/partials/toc.html | 2 +-
mkdocs.yml | 23 +++++++++++++++--------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d72ee28f9..4ab965f0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ mkdocs:
- pip freeze # debug
- python scripts/modules_matrix.py > docs.it4i/modules-matrix.md
- python scripts/modules_matrix.py --json > docs.it4i/modules-matrix.json
- - declare -Ff deactivate && deactivate
+ #- declare -Ff deactivate && deactivate
- curl -f0 https://code.it4i.cz/sccs/scs-api-public/raw/master/scs_api.server_public.md -o docs.it4i/apiv1.md
# build pages
- mkdocs build
diff --git a/material/partials/toc.html b/material/partials/toc.html
index bd79493ff..fd00d5c90 100644
--- a/material/partials/toc.html
+++ b/material/partials/toc.html
@@ -1,5 +1,5 @@
{% import "partials/language.html" as lang with context %}
-<nav class="md-nav md-nav--secondary">
+<nav class="md-nav md-nav--secondary" aria-label="{{ lang.t('toc.title') }}">
{% set toc_ = page.toc %}
{% if toc_ | first is defined and "\x3ch1 id=" in page.content %}
{% set toc_ = (toc_ | first).children %}
diff --git a/mkdocs.yml b/mkdocs.yml
index b740e0b3d..a0ad3183c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,7 +25,12 @@ theme:
- 404.html
feature:
- tabs: true
+ - tabs
+ - instant
+
+ icon:
+ logo: fontawesome/solid/book-open
+ repo: fontawesome/brands/gitlab
# Don't include MkDocs' JavaScript
include_search_page: false
@@ -212,17 +217,19 @@ nav:
- PBS Pro Documentation: pbspro.md
extra:
- search:
- language: 'en'
- tokenizer: '[\s\.]+'
- repo_icon: gitlab
disqus: 'test-3whnesz3gq'
social:
- - type: 'gitlab'
+ - icon: 'fontawesome/brands/gitlab'
link: 'https://code.it4i.cz/sccs/docs.it4i.cz'
- - type: globe
+ - icon: fontawesome/solid/globe-europe
link: https://www.it4i.cz
+plugins:
+ - search:
+ separator: '[\s\.]+'
+ lang:
+ - en
+
markdown_extensions:
- codehilite
- markdown.extensions.admonition:
@@ -232,7 +239,7 @@ markdown_extensions:
slugify: !!python/name:pymdownx.slugs.uslugify
- pymdownx.snippets:
base_path: snippets
- - pymdownx.superfences
+ - pymdownx.tabbed:
google_analytics:
- 'UA-90498826-1'
--
GitLab