Skip to content

Fix epub-related failures #8207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 25, 2023
Merged

Fix epub-related failures #8207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4341ec2
Append closing "/" to meta description tag; do not add new descriptio…
dylannorthrup Oct 9, 2023
2f98ef9
Add closing "/" to all meta tags
dylannorthrup Oct 9, 2023
21da612
Remove URL parameters from css/js paths to fix ThemeError
dylannorthrup Oct 9, 2023
3352def
Updating package versions to reflect the latest versions in the readt…
dylannorthrup Oct 9, 2023
704afa2
noop change to trigger CI workflow
dylannorthrup Oct 10, 2023
57a30ca
Add verbose option to "pip3 install"
dylannorthrup Oct 10, 2023
1dff25c
Update python version to 3.9
dylannorthrup Oct 10, 2023
b4cb5a0
Debug Iteration
dylannorthrup Oct 10, 2023
5429403
Revert CI testing changes
dylannorthrup Oct 22, 2023
2647e6b
Revert module upgrades and changes it required
dylannorthrup Oct 22, 2023
7bf77d8
Update _extensions/godot_descriptions.py
mhilbrunner Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions _extensions/godot_descriptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ def generate_description(app, pagename, templatename, context, doctree):
doctree.walkabout(generator)

description = (
'<meta name="description" content="' + generator.create_description() + '">\n'
'<meta name="description" content="' + generator.create_description() + '" />\n'
)

context["metatags"] += description
if not '<meta name="description"' in context["metatags"]:
context["metatags"] += description


def setup(app):
Expand Down
7 changes: 3 additions & 4 deletions _templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
{% endblock -%}

{% block extrahead -%}
<meta name="doc_version" content="{{ version }}">
<meta name="doc_is_latest" content="{{ godot_is_latest }}">
<meta name="doc_version" content="{{ version }}" />
<meta name="doc_is_latest" content="{{ godot_is_latest }}" />
{% endblock -%}

{% block linktags -%}
<meta name="theme-color" content="#3d8fcc">
<meta name="theme-color" content="#3d8fcc" />
{% if godot_inject_language_links -%}
{% for alternate_lang in godot_docs_supported_languages -%}
{# Convert to ISO 639-1 format, e.g. zh_CN -> zh-cn -#}
Expand Down Expand Up @@ -66,7 +66,6 @@
{% endif %}

{% block body %}{% endblock %}
</div>
{%- if self.comments()|trim %}
<div class="articleComments">
{%- block comments %}{% endblock %}
Expand Down