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

# Conflicts: # CHANGES
sphinx-doc · Jun 6, 2022 · 3345723 · 3345723
2 parents 36e79d7 + 34c5caf
commit 3345723
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -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
@@ -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
@@ -396,7 +396,7 @@ def make_xrefs(self, rolename: str, domain: str, target: str,
                 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