diff options
| author | Adam Turner <9087854+AA-Turner@users.noreply.github.com> | 2022-06-06 17:27:55 +0300 |
|---|---|---|
| committer | Adam Turner <9087854+AA-Turner@users.noreply.github.com> | 2022-06-06 17:27:55 +0300 |
| commit | 334572383e93415a4c780bc16baefb488758b19c (patch) | |
| tree | fffcc49645e9b427c7a270d30098eacb230db4d5 | |
| parent | 36e79d708964be486115a7192b7622a310bf715c (diff) | |
| parent | 34c5caf11610774c48eff7914b5e4b59a9b2b91e (diff) | |
Merge remote-tracking branch 'upstream/5.0.x' into fix-double-brackets
# Conflicts:
# CHANGES
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | doc/_themes/sphinx13/static/sphinx13.css | 3 | ||||
| -rw-r--r-- | sphinx/domains/python.py | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -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. diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css index c8fb2e5c9..789a5d4f3 100644 --- a/doc/_themes/sphinx13/static/sphinx13.css +++ b/doc/_themes/sphinx13/static/sphinx13.css @@ -372,7 +372,8 @@ div.quotebar { margin-left: 1em; } -div.topic { +div.topic, +aside.topic { background-color: #f8f8f8; } diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index a634a51d2..fd43b15b2 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -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 |