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 branch '3.x'

Browse Source
This commit is contained in:
Takeshi KOMIYA
2021-04-11 20:30:40 +09:00
parent 6365c0e9bd 1c6df11a8d
commit 8a5cb89714
8 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View File

@@ -23,9 +23,9 @@ jobs:
python: 3.9 python: 3.9
docutils: du16 docutils: du16
coverage: "--cov ./ --cov-append --cov-config setup.cfg" coverage: "--cov ./ --cov-append --cov-config setup.cfg"
- name: py310-dev # - name: py310-dev
python: 3.10-dev # python: 3.10-dev
docutils: du16 # docutils: du16
env: env:
PYTEST_ADDOPTS: ${{ matrix.coverage }} PYTEST_ADDOPTS: ${{ matrix.coverage }}

28
CHANGES
View File

@@ -134,14 +134,12 @@ Bugs fixed
Testing Testing
-------- --------
Release 3.5.4 (in development) Release 3.5.5 (in development)
============================== ==============================
Dependencies Dependencies
------------ ------------
* #9071: Restrict docutils to 0.16
Incompatible changes Incompatible changes
-------------------- --------------------
@@ -154,14 +152,28 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #9078: autodoc: Async staticmethods and classmethods are considered as non
async coroutine-functions with Python3.10
* #8870: The style of toctree captions has been changed with docutils-0.17
* #9001: The style of ``sidebar`` directive has been changed with docutils-0.17
Testing Testing
-------- --------
Release 3.5.4 (released Apr 11, 2021)
=====================================
Dependencies
------------
* #9071: Restrict docutils to 0.16
Bugs fixed
----------
* #9078: autodoc: Async staticmethods and classmethods are considered as non
async coroutine-functions with Python3.10
* #8870, #9001, #9051: html theme: The style are not applied with docutils-0.17
- toctree captions
- The content of ``sidebar`` directive
- figures
Release 3.5.3 (released Mar 20, 2021) Release 3.5.3 (released Mar 20, 2021)
===================================== =====================================

18
sphinx/themes/agogo/static/agogo.css_t
View File

@@ -370,19 +370,25 @@ div.footer .left {
/* Styles copied from basic theme */ /* Styles copied from basic theme */
img.align-left, .figure.align-left, object.align-left { img.align-left, figure.align-left, .figure.align-left, object.align-left {
clear: left; clear: left;
float: left; float: left;
margin-right: 1em; margin-right: 1em;
} }
img.align-right, .figure.align-right, object.align-right { img.align-right, figure.align-right, .figure.align-right, object.align-right {
clear: right; clear: right;
float: right; float: right;
margin-left: 1em; margin-left: 1em;
} }
img.align-center, .figure.align-center, object.align-center { img.align-center, figure.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
img.align-default, figure.align-default, .figure.align-default {
display: block; display: block;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@@ -407,11 +413,13 @@ table caption span.caption-number {
table caption span.caption-text { table caption span.caption-text {
} }
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* -- search page ----------------------------------------------------------- */ /* -- search page ----------------------------------------------------------- */

18
sphinx/themes/basic/static/basic.css_t
View File

@@ -277,25 +277,25 @@ p.rubric {
font-weight: bold; font-weight: bold;
} }
img.align-left, .figure.align-left, object.align-left { img.align-left, figure.align-left, .figure.align-left, object.align-left {
clear: left; clear: left;
float: left; float: left;
margin-right: 1em; margin-right: 1em;
} }
img.align-right, .figure.align-right, object.align-right { img.align-right, figure.align-right, .figure.align-right, object.align-right {
clear: right; clear: right;
float: right; float: right;
margin-left: 1em; margin-left: 1em;
} }
img.align-center, .figure.align-center, object.align-center { img.align-center, figure.align-center, .figure.align-center, object.align-center {
display: block; display: block;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
img.align-default, .figure.align-default { img.align-default, figure.align-default, .figure.align-default {
display: block; display: block;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@@ -458,20 +458,22 @@ td > :last-child {
/* -- figures --------------------------------------------------------------- */ /* -- figures --------------------------------------------------------------- */
div.figure { div.figure, figure {
margin: 0.5em; margin: 0.5em;
padding: 0.5em; padding: 0.5em;
} }
div.figure p.caption { div.figure p.caption, figcaption {
padding: 0.3em; padding: 0.3em;
} }
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* -- field list styles ----------------------------------------------------- */ /* -- field list styles ----------------------------------------------------- */

6
sphinx/themes/epub/static/epub.css_t
View File

@@ -325,11 +325,13 @@ table.citation td {
/* -- figures --------------------------------------------------------------- */ /* -- figures --------------------------------------------------------------- */
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* -- field list styles ----------------------------------------------------- */ /* -- field list styles ----------------------------------------------------- */

6
sphinx/themes/nonav/static/nonav.css
View File

@@ -314,11 +314,13 @@ table.citation td {
/* -- figures --------------------------------------------------------------- */ /* -- figures --------------------------------------------------------------- */
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* -- field list styles ----------------------------------------------------- */ /* -- field list styles ----------------------------------------------------- */

6
sphinx/themes/scrolls/static/scrolls.css_t
View File

@@ -478,11 +478,13 @@ div.viewcode-block:target {
padding: 0 5px; padding: 0 5px;
} }
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* math display */ /* math display */

6
sphinx/themes/traditional/static/traditional.css_t
View File

@@ -743,11 +743,13 @@ div.literal-block-wrapper pre {
margin: 0; margin: 0;
} }
div.figure p.caption span.caption-number { div.figure p.caption span.caption-number,
figcaption span.caption-number {
font-style: italic; font-style: italic;
} }
div.figure p.caption span.caption-text { div.figure p.caption span.caption-text,
figcaption span.caption-text {
} }
/* :::: MATH DISPLAY :::: */ /* :::: MATH DISPLAY :::: */