From 045fc6807820ba1a1976799a237cc01cfc8403c8 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 27 Jun 2020 17:23:55 +0200 Subject: [PATCH 1/5] basic CSS: remove overflow-x from admonition/topic, allow more "floating" --- sphinx/themes/basic/static/basic.css_t | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t index e0f24c8a1..53e685061 100644 --- a/sphinx/themes/basic/static/basic.css_t +++ b/sphinx/themes/basic/static/basic.css_t @@ -328,8 +328,8 @@ p.sidebar-title { font-weight: bold; } -div.admonition, div.topic, pre, div[class|="highlight"] { - clear: both; +div.admonition, div.topic, blockquote { + clear: left; } /* -- topics ---------------------------------------------------------------- */ @@ -338,7 +338,6 @@ div.topic { border: 1px solid #ccc; padding: 7px; margin: 10px 0 10px 0; - overflow-x: auto; } p.topic-title { @@ -353,7 +352,6 @@ div.admonition { margin-top: 10px; margin-bottom: 10px; padding: 7px; - overflow-x: auto; } div.admonition dt { @@ -680,6 +678,10 @@ pre { overflow-y: hidden; /* fixes display issues on Chrome browsers */ } +pre, div[class|="highlight"] { + clear: both; +} + span.pre { -moz-hyphens: none; -ms-hyphens: none; From 3098aba3431eb8c40ea052d6b8fc90328802c389 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 27 Jun 2020 17:57:27 +0200 Subject: [PATCH 2/5] basic CSS: apply "clearfix" to admonitions etc. --- sphinx/themes/basic/static/basic.css_t | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t index 53e685061..a22ef80d4 100644 --- a/sphinx/themes/basic/static/basic.css_t +++ b/sphinx/themes/basic/static/basic.css_t @@ -15,6 +15,12 @@ div.clearer { clear: both; } +div.section::after { + display: block; + content: ''; + clear: left; +} + /* -- relbar ---------------------------------------------------------------- */ div.related { @@ -376,6 +382,15 @@ div.admonition > :last-child { margin-bottom: 0; } +div.sidebar::after, +div.topic::after, +div.admonition::after, +blockquote::after { + display: block; + content: ''; + clear: both; +} + /* -- tables ---------------------------------------------------------------- */ table.docutils { From c40cb79461da8b7b1322fb8ed69c0c16f0191e9f Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sun, 5 Jul 2020 10:38:39 +0200 Subject: [PATCH 3/5] Update CHANGES for PR #7878 --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 5ce96bac1..db12b571a 100644 --- a/CHANGES +++ b/CHANGES @@ -32,6 +32,7 @@ Bugs fixed an attribute and module that are same name * #7806: viewcode: Failed to resolve viewcode references on 3rd party builders * #7838: html theme: List items have extra vertical space +* #7878: html theme: Undesired interaction between "overflow" and "float" Testing -------- From 1cb5fa2f6a02ac4425e3db40c8c40bba7d831a9e Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 5 Jul 2020 19:43:41 +0900 Subject: [PATCH 4/5] Bump to 3.1.2 final --- CHANGES | 16 ++-------------- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index db12b571a..07bef0caa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,5 @@ -Release 3.1.2 (in development) -============================== - -Dependencies ------------- +Release 3.1.2 (released Jul 05, 2020) +===================================== Incompatible changes -------------------- @@ -10,12 +7,6 @@ Incompatible changes * #7650: autodoc: the signature of base function will be shown for decorated functions, not a signature of decorator -Deprecated ----------- - -Features added --------------- - Bugs fixed ---------- @@ -34,9 +25,6 @@ Bugs fixed * #7838: html theme: List items have extra vertical space * #7878: html theme: Undesired interaction between "overflow" and "float" -Testing --------- - Release 3.1.1 (released Jun 14, 2020) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index b513a1df5..912fa5347 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,7 +32,7 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.1.2+' +__version__ = '3.1.2' __released__ = '3.1.2' # used when Sphinx builds its own docs #: Version info for better programmatic use. @@ -43,7 +43,7 @@ __released__ = '3.1.2' # used when Sphinx builds its own docs #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 1, 2, 'beta', 0) +version_info = (3, 1, 2, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From faae257a9d9e874067971d831e126da03a5f36b8 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 5 Jul 2020 19:45:31 +0900 Subject: [PATCH 5/5] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 07bef0caa..42fb4b549 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 3.1.3 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 3.1.2 (released Jul 05, 2020) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 912fa5347..e75381cee 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,8 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.1.2' -__released__ = '3.1.2' # used when Sphinx builds its own docs +__version__ = '3.1.3+' +__released__ = '3.1.3' # used when Sphinx builds its own docs #: Version info for better programmatic use. #: @@ -43,7 +43,7 @@ __released__ = '3.1.2' # used when Sphinx builds its own docs #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 1, 2, 'final', 0) +version_info = (3, 1, 3, 'beta', 0) package_dir = path.abspath(path.dirname(__file__))