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

Closes #1630: resolve CSS conflicts, `div.container css target for literal block wrapper now renamed to div.literal-block-wrapper`.

Browse Source
This commit is contained in:
shimizukawa 2015-02-23 00:38:09 +09:00
parent b0e77e4c75
commit 59fedc0791
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -52,6 +52,8 @@ Bugs fixed
* #1722: restore ``toctree()`` template function behavior that was changed at 1.3b1. * #1722: restore ``toctree()`` template function behavior that was changed at 1.3b1.
* #1732: i18n: localized table caption raises exception. * #1732: i18n: localized table caption raises exception.
* #1718: ``:numref:`` does not work with capital letters in the label * #1718: ``:numref:`` does not work with capital letters in the label
* #1630: resolve CSS conflicts, ``div.container`` css target for literal block wrapper
now renamed to ``div.literal-block-wrapper``.
Release 1.3b2 (released Dec 5, 2014) Release 1.3b2 (released Dec 5, 2014)

3
sphinx/directives/code.py
View File

@ -63,7 +63,8 @@ def dedent_lines(lines, dedent):
def container_wrapper(directive, literal_node, caption): def container_wrapper(directive, literal_node, caption):
container_node = nodes.container('', literal_block=True) container_node = nodes.container('', literal_block=True,
classes=['literal-block-wrapper'])
parsed = nodes.Element() parsed = nodes.Element()
directive.state.nested_parse(ViewList([caption], source=''), directive.state.nested_parse(ViewList([caption], source=''),
directive.content_offset, parsed) directive.content_offset, parsed)

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

@ -210,12 +210,12 @@ div.document div.highlight {
margin-bottom: .8em; margin-bottom: .8em;
} }
div.document div.container { div.document div.literal-block-wrapper {
margin-top: .8em; margin-top: .8em;
margin-bottom: .8em; margin-bottom: .8em;
} }
div.document div.container div.highlight { div.document div.literal-block-wrapper div.highlight {
margin: 0; margin: 0;
} }

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

@ -525,11 +525,11 @@ div.code-block-caption span.caption-number {
div.code-block-caption span.caption-text { div.code-block-caption span.caption-text {
} }
div.container { div.literal-block-wrapper {
padding: 1em 1em 0; padding: 1em 1em 0;
} }
div.container div.highlight { div.literal-block-wrapper div.highlight {
margin: 0; margin: 0;
} }

2
sphinx/themes/bizstyle/static/bizstyle.css_t
View File

@ -448,7 +448,7 @@ th {
background-color: #82A0BE; background-color: #82A0BE;
} }
div.container div.code-block-caption { div.literal-block-wrapper div.code-block-caption {
background-color: #EEE; background-color: #EEE;
border-style: solid; border-style: solid;
border-color: #CCC; border-color: #CCC;

4
sphinx/themes/epub/static/epub.css
View File

@ -461,11 +461,11 @@ div.code-block-caption span.caption-number {
div.code-block-caption span.caption-text { div.code-block-caption span.caption-text {
} }
div.container { div.literal-block-wrapper {
padding: 1em 1em 0; padding: 1em 1em 0;
} }
div.container div.highlight { div.literal-block-wrapper div.highlight {
margin: 0; margin: 0;
} }

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

@ -217,11 +217,11 @@ div.code-block-caption span.caption-number {
div.code-block-caption span.caption-text { div.code-block-caption span.caption-text {
} }
div.container { div.literal-block-wrapper {
padding: 1em 1em 0; padding: 1em 1em 0;
} }
div.container pre { div.literal-block-wrapper pre {
margin: 0; margin: 0;
} }

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

@ -722,11 +722,11 @@ div.code-block-caption span.caption-number {
div.code-block-caption span.caption-text { div.code-block-caption span.caption-text {
} }
div.container { div.literal-block-wrapper {
padding: 1em 1em 0; padding: 1em 1em 0;
} }
div.container pre { div.literal-block-wrapper pre {
margin: 0; margin: 0;
} }