IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/5.0.x' into fix-double-brackets

Browse Source 
# Conflicts:
#	CHANGES
This commit is contained in:
Adam Turner
2022-06-06 15:27:55 +01:00
parent 36e79d7089 34c5caf116
commit 334572383e
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -20,6 +20,7 @@ Bugs fixed
----------
* #10509: autosummary: autosummary fails with a shared library
* #10497: py domain: Failed to resolve strings in Literal. Patch by Adam Turner.
* #10523: HTML Theme: Fix double brackets on citation references in Docutils 0.18+.
Patch by Adam Turner.

3
doc/_themes/sphinx13/static/sphinx13.css vendored
View File

@@ -372,7 +372,8 @@ div.quotebar {
margin-left: 1em;
}
div.topic {
div.topic,
aside.topic {
background-color: #f8f8f8;
}

2
sphinx/domains/python.py
View File

@@ -396,7 +396,7 @@ class PyXrefMixin:
results.append(self.make_xref(rolename, domain, sub_target,
innernode, contnode, env, inliner, location))
if sub_target in ('Literal', 'typing.Literal'):
if sub_target in ('Literal', 'typing.Literal', '~typing.Literal'):
in_literal = True
return results