Skip to content
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

Jump to bottom

Fix support for html logo and favicon as url #9381

Merged
merged 4 commits into from Jun 30, 2021
Merged

Fix support for html logo and favicon as url #9381

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3ad66b
Fix support for html logo and favicon as url
tronical Jun 25, 2021
6cb649f
Merge branch '4.x' of https://github.com/sphinx-doc/sphinx into logo-…
tronical Jun 28, 2021
9f04ac8
Simplify logo and favicon assignment
tronical Jun 28, 2021
6a4c215
Add unit test for remote logo and fav icon
tronical Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions sphinx/builders/html/__init__.py
View file
Open in desktop
Expand Up @@ -468,8 +468,8 @@ def prepare_writing(self, docnames: Set[str]) -> None:
else:
self.last_updated = None

logo = path.basename(self.config.html_logo) if self.config.html_logo else ''
favicon = path.basename(self.config.html_favicon) if self.config.html_favicon else ''
logo = self.config.html_logo if self.config.html_logo else ''
favicon = self.config.html_favicon if self.config.html_favicon else ''
tk0miya marked this conversation as resolved.
Show resolved Hide resolved
tk0miya marked this conversation as resolved.
Show resolved Hide resolved

self.relations = self.env.collect_relations()

Expand Down