Merge pull request #10535 from AA-Turner/css-nav-contents

tk0miya · web-flow · commit 377d8668b5c9 · 2022-06-15T02:36:03.000+09:00
Fix `nav.contents` CSS for Docutils 0.18
diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css
@@ -372,6 +372,7 @@ div.quotebar {
     margin-left: 1em;
 }
 
+nav.contents,
 div.topic,
 aside.topic {
     background-color: #f8f8f8;
diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
@@ -337,13 +337,21 @@ p.sidebar-title {
     font-weight: bold;
 }
 
-div.admonition, div.topic, aside.topic, blockquote {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.admonition, div.topic, blockquote {
     clear: left;
 }
 
 /* -- topics ---------------------------------------------------------------- */
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     border: 1px solid #ccc;
     padding: 7px;
     margin: 10px 0 10px 0;
@@ -381,16 +389,22 @@ div.body p.centered {
 
 div.sidebar > :last-child,
 aside.sidebar > :last-child,
-div.topic > :last-child,
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents > :last-child,
 aside.topic > :last-child,
+{% endif %}
+div.topic > :last-child,
 div.admonition > :last-child {
     margin-bottom: 0;
 }
 
 div.sidebar::after,
 aside.sidebar::after,
-div.topic::after,
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents::after,
 aside.topic::after,
+{% endif %}
+div.topic::after,
 div.admonition::after,
 blockquote::after {
     display: block;
diff --git a/sphinx/themes/bizstyle/static/bizstyle.css_t b/sphinx/themes/bizstyle/static/bizstyle.css_t
@@ -306,7 +306,11 @@ div.quotebar {
     border: 1px solid #ccc;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #f8f8f8;
 }
 
diff --git a/sphinx/themes/classic/static/classic.css_t b/sphinx/themes/classic/static/classic.css_t
@@ -290,7 +290,11 @@ div.seealso {
     border: 1px solid #ff6;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #eee;
 }
 
diff --git a/sphinx/themes/epub/static/epub.css_t b/sphinx/themes/epub/static/epub.css_t
@@ -245,7 +245,11 @@ p.sidebar-title {
 
 /* -- topics ---------------------------------------------------------------- */
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     border: 1px solid #ccc;
     padding: 7px 7px 0 7px;
     margin: 10px 0 10px 0;
diff --git a/sphinx/themes/nature/static/nature.css_t b/sphinx/themes/nature/static/nature.css_t
@@ -194,7 +194,11 @@ div.seealso {
     border: 1px solid #ff6;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #eee;
 }
 
diff --git a/sphinx/themes/nonav/static/nonav.css_t b/sphinx/themes/nonav/static/nonav.css_t
@@ -234,7 +234,11 @@ p.sidebar-title {
 
 /* -- topics ---------------------------------------------------------------- */
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     border: 1px solid #ccc;
     padding: 7px 7px 0 7px;
     margin: 10px 0 10px 0;
diff --git a/sphinx/themes/pyramid/static/epub.css_t b/sphinx/themes/pyramid/static/epub.css_t
@@ -254,7 +254,11 @@ div.seealso {
     border: 1px solid #ff6;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #eee;
 }
 
diff --git a/sphinx/themes/pyramid/static/pyramid.css_t b/sphinx/themes/pyramid/static/pyramid.css_t
@@ -245,7 +245,11 @@ div.seealso {
     padding: 10px 20px 10px 60px;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background: #eeeeee;
     border: 2px solid #C6C9CB;
     padding: 10px 20px;
diff --git a/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t b/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t
@@ -266,7 +266,11 @@ div.quotebar {
     border: 1px solid #ccc;
 }
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #f8f8f8;
 }
 
diff --git a/sphinx/themes/traditional/static/traditional.css_t b/sphinx/themes/traditional/static/traditional.css_t
@@ -506,7 +506,11 @@ p.rubric {
 
 /* "Topics" */
 
-div.topic, aside.topic {
+{%- if docutils_version_info[:2] >= (0, 18) %}
+nav.contents,
+aside.topic,
+{% endif %}
+div.topic {
     background-color: #eee;
     border: 1px solid #ccc;
     padding: 0 7px 0 7px;

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ div.quotebar {`
`372`	`372`	`margin-left: 1em;`
`373`	`373`	`}`
`374`	`374`
	`375`	`+nav.contents,`
`375`	`376`	`div.topic,`
`376`	`377`	`aside.topic {`
`377`	`378`	`background-color: #f8f8f8;`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,11 @@ div.quotebar {`
`306`	`306`	`border: 1px solid #ccc;`
`307`	`307`	`}`
`308`	`308`
`309`		`-div.topic, aside.topic {`
	`309`	`+{%- if docutils_version_info[:2] >= (0, 18) %}`
	`310`	`+nav.contents,`
	`311`	`+aside.topic,`
	`312`	`+{% endif %}`
	`313`	`+div.topic {`
`310`	`314`	`background-color: #f8f8f8;`
`311`	`315`	`}`
`312`	`316`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,11 @@ div.seealso {`
`290`	`290`	`border: 1px solid #ff6;`
`291`	`291`	`}`
`292`	`292`
`293`		`-div.topic, aside.topic {`
	`293`	`+{%- if docutils_version_info[:2] >= (0, 18) %}`
	`294`	`+nav.contents,`
	`295`	`+aside.topic,`
	`296`	`+{% endif %}`
	`297`	`+div.topic {`
`294`	`298`	`background-color: #eee;`
`295`	`299`	`}`
`296`	`300`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,11 @@ div.seealso {`
`194`	`194`	`border: 1px solid #ff6;`
`195`	`195`	`}`
`196`	`196`
`197`		`-div.topic, aside.topic {`
	`197`	`+{%- if docutils_version_info[:2] >= (0, 18) %}`
	`198`	`+nav.contents,`
	`199`	`+aside.topic,`
	`200`	`+{% endif %}`
	`201`	`+div.topic {`
`198`	`202`	`background-color: #eee;`
`199`	`203`	`}`
`200`	`204`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,11 @@ div.seealso {`
`254`	`254`	`border: 1px solid #ff6;`
`255`	`255`	`}`
`256`	`256`
`257`		`-div.topic, aside.topic {`
	`257`	`+{%- if docutils_version_info[:2] >= (0, 18) %}`
	`258`	`+nav.contents,`
	`259`	`+aside.topic,`
	`260`	`+{% endif %}`
	`261`	`+div.topic {`
`258`	`262`	`background-color: #eee;`
`259`	`263`	`}`
`260`	`264`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,11 @@ div.quotebar {`
`266`	`266`	`border: 1px solid #ccc;`
`267`	`267`	`}`
`268`	`268`
`269`		`-div.topic, aside.topic {`
	`269`	`+{%- if docutils_version_info[:2] >= (0, 18) %}`
	`270`	`+nav.contents,`
	`271`	`+aside.topic,`
	`272`	`+{% endif %}`
	`273`	`+div.topic {`
`270`	`274`	`background-color: #f8f8f8;`
`271`	`275`	`}`
`272`	`276`