From 27f05328d0369ad0db85c27935d52fdadf020f6b Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Tue, 7 Jun 2022 23:21:52 +0100 Subject: [PATCH] Move `aside.topic` into the conditional blocks --- sphinx/themes/basic/static/basic.css_t | 10 ++++++---- sphinx/themes/bizstyle/static/bizstyle.css_t | 3 ++- sphinx/themes/classic/static/classic.css_t | 3 ++- sphinx/themes/epub/static/epub.css_t | 3 ++- sphinx/themes/nature/static/nature.css_t | 3 ++- sphinx/themes/nonav/static/nonav.css_t | 3 ++- sphinx/themes/pyramid/static/epub.css_t | 3 ++- sphinx/themes/pyramid/static/pyramid.css_t | 3 ++- sphinx/themes/sphinxdoc/static/sphinxdoc.css_t | 3 ++- sphinx/themes/traditional/static/traditional.css_t | 3 ++- 10 files changed, 24 insertions(+), 13 deletions(-) diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t index 0a0447f0ff4..d8f3fe74626 100644 --- a/sphinx/themes/basic/static/basic.css_t +++ b/sphinx/themes/basic/static/basic.css_t @@ -339,8 +339,9 @@ p.sidebar-title { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.admonition, div.topic, aside.topic, blockquote { +div.admonition, div.topic, blockquote { clear: left; } @@ -348,8 +349,9 @@ div.admonition, div.topic, aside.topic, blockquote { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { border: 1px solid #ccc; padding: 7px; margin: 10px 0 10px 0; @@ -389,9 +391,9 @@ div.sidebar > :last-child, aside.sidebar > :last-child, {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents > :last-child, +aside.topic > :last-child, {% endif %} div.topic > :last-child, -aside.topic > :last-child, div.admonition > :last-child { margin-bottom: 0; } @@ -400,9 +402,9 @@ div.sidebar::after, aside.sidebar::after, {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents::after, +aside.topic::after, {% endif %} div.topic::after, -aside.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 index 47dcc7e4fb0..a524345f9a9 100644 --- a/sphinx/themes/bizstyle/static/bizstyle.css_t +++ b/sphinx/themes/bizstyle/static/bizstyle.css_t @@ -308,8 +308,9 @@ div.quotebar { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #f8f8f8; } diff --git a/sphinx/themes/classic/static/classic.css_t b/sphinx/themes/classic/static/classic.css_t index 9107dc9344d..789bec81128 100644 --- a/sphinx/themes/classic/static/classic.css_t +++ b/sphinx/themes/classic/static/classic.css_t @@ -292,8 +292,9 @@ div.seealso { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #eee; } diff --git a/sphinx/themes/epub/static/epub.css_t b/sphinx/themes/epub/static/epub.css_t index 9cc47152bdc..a30344431a0 100644 --- a/sphinx/themes/epub/static/epub.css_t +++ b/sphinx/themes/epub/static/epub.css_t @@ -247,8 +247,9 @@ p.sidebar-title { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +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 index c1a2cd6cb71..93f9a594483 100644 --- a/sphinx/themes/nature/static/nature.css_t +++ b/sphinx/themes/nature/static/nature.css_t @@ -196,8 +196,9 @@ div.seealso { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #eee; } diff --git a/sphinx/themes/nonav/static/nonav.css_t b/sphinx/themes/nonav/static/nonav.css_t index d62536ab230..933365e073c 100644 --- a/sphinx/themes/nonav/static/nonav.css_t +++ b/sphinx/themes/nonav/static/nonav.css_t @@ -236,8 +236,9 @@ p.sidebar-title { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +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 index 7f59c670c84..98741d0b8ab 100644 --- a/sphinx/themes/pyramid/static/epub.css_t +++ b/sphinx/themes/pyramid/static/epub.css_t @@ -256,8 +256,9 @@ div.seealso { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #eee; } diff --git a/sphinx/themes/pyramid/static/pyramid.css_t b/sphinx/themes/pyramid/static/pyramid.css_t index bf18b8b156a..0ced6b29f8e 100644 --- a/sphinx/themes/pyramid/static/pyramid.css_t +++ b/sphinx/themes/pyramid/static/pyramid.css_t @@ -247,8 +247,9 @@ div.seealso { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +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 index f6a83840425..1817c48bcf5 100644 --- a/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t +++ b/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t @@ -268,8 +268,9 @@ div.quotebar { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #f8f8f8; } diff --git a/sphinx/themes/traditional/static/traditional.css_t b/sphinx/themes/traditional/static/traditional.css_t index 5caf48ccf6c..8a2f0712fbe 100644 --- a/sphinx/themes/traditional/static/traditional.css_t +++ b/sphinx/themes/traditional/static/traditional.css_t @@ -508,8 +508,9 @@ p.rubric { {%- if docutils_version_info[:2] >= (0, 18) %} nav.contents, +aside.topic, {% endif %} -div.topic, aside.topic { +div.topic { background-color: #eee; border: 1px solid #ccc; padding: 0 7px 0 7px;