summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2021-04-20 01:13:05 +0900
committerGitHub <noreply@github.com>2021-04-20 01:13:05 +0900
commita31135834bcfa23aeb4b5a1b90af6411d35b2aaf (patch)
treee21660224865967fa96d425b51ee7afb22b39731
parentda792470b66fcd88e915367100a64d6a51c1e0fd (diff)
parentcf4d3da081a1fc4de4f88885fd07c82a87f8444b (diff)
downloadsphinx-git-a31135834bcfa23aeb4b5a1b90af6411d35b2aaf.tar.gz
Merge branch '4.0.x' into 9095_TypeError_on_broken_metaclass
-rw-r--r--CHANGES1
-rw-r--r--doc/usage/extensions/autodoc.rst2
-rw-r--r--sphinx/themes/basic/static/basic.css_t6
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index a13b2f3b9..8bfc3fb76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ Features added
* #8818: autodoc: Super class having ``Any`` arguments causes nit-picky warning
* #9095: autodoc: TypeError is raised on processing broken metaclass
+* #9098: html: copy-range protection for doctests doesn't work in Safari
* #9103: LaTeX: imgconverter: conversion runs even if not needed
* #8127: py domain: Ellipsis in info-field-list causes nit-picky warning
* #9023: More CSS classes on domain descriptions, see :ref:`nodes` for details.
diff --git a/doc/usage/extensions/autodoc.rst b/doc/usage/extensions/autodoc.rst
index 1bfa8086c..da0ff7c99 100644
--- a/doc/usage/extensions/autodoc.rst
+++ b/doc/usage/extensions/autodoc.rst
@@ -563,7 +563,7 @@ There are also config values that you can set:
.. confval:: autodoc_typehints
- This value controls how to represents typehints. The setting takes the
+ This value controls how to represent typehints. The setting takes the
following values:
* ``'signature'`` -- Show typehints as its signature (default)
diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 25ab688e4..db43499ad 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -820,7 +820,11 @@ div.code-block-caption code {
table.highlighttable td.linenos,
span.linenos,
div.doctest > div.highlight span.gp { /* gp: Generic.Prompt */
- user-select: none;
+ user-select: none;
+ -webkit-user-select: text; /* Safari fallback only */
+ -webkit-user-select: none; /* Chrome/Safari */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* IE10+ */
}
div.code-block-caption span.caption-number {