diff --git a/.gitignore b/.gitignore index 62a1265..c22ecac 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ __pycache__ wiki/trash wiki/notes.sqlite upload.sh +wiki/**/*.png +wiki/**/*.png.cache diff --git a/pelicanconf-full.py b/pelicanconf-full.py index c56317d..5b8a777 100644 --- a/pelicanconf-full.py +++ b/pelicanconf-full.py @@ -75,7 +75,7 @@ I18N_GETTEXT_DOMAIN = 'messages' JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] -PLUGINS = [i18n(), "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "replacer", "asciidoctor"] +PLUGINS = [i18n(), "pelican-css", "series", "subcategory", "tag_cloud", "tipue_search", "replacer", "asciidoctor"] ASCIIDOCTOR_CMD = "asciidoctor" @@ -87,6 +87,7 @@ ASCIIDOCTOR_EXTRA_OPTIONS = [ '--attribute=pygments-css=class', '--attribute=lang=ru', '--attribute=figure-caption=Рис.', + '--attribute=toc-title=Содержание', '--attribute=experimental', ] diff --git a/pelicanconf.py b/pelicanconf.py index f785ead..88ac103 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -75,7 +75,7 @@ I18N_GETTEXT_DOMAIN = 'messages' JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] -PLUGINS = [i18n(), "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "replacer", "asciidoctor"] +PLUGINS = [i18n(), "pelican-css", "series", "subcategory", "tag_cloud", "tipue_search", "replacer", "asciidoctor"] ASCIIDOCTOR_CMD = "asciidoctor" diff --git a/themes/bootstrap4 b/themes/bootstrap4 index 905ab86..ce6b186 160000 --- a/themes/bootstrap4 +++ b/themes/bootstrap4 @@ -1 +1 @@ -Subproject commit 905ab8643375567ca466033b89e33c9ca0ce559a +Subproject commit ce6b18660a933855dbe996fc5b5d3d0ac1c25223