From 5845a0ab87afa68b1553090c6535cf21677cf6c5 Mon Sep 17 00:00:00 2001
From: Matthias Geier <Matthias.Geier@gmail.com>
Date: Thu, 18 Jun 2020 23:37:51 +0200
Subject: [PATCH 1/3] basic CSS: Take "simple" and "compact" lists into account

See #7838.
---
 sphinx/themes/basic/static/basic.css_t | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index cf169f5e3..a1b8ce10a 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -537,6 +537,14 @@ ul ul > li:last-child > :last-child {
     margin-bottom: revert;
 }
 
+ol.simple > li > p,
+ul.simple > li > p,
+ol.compact > li > p,
+ul.compact > li > p {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
 dl.footnote > dt,
 dl.citation > dt {
     float: left;

From 0051992ba514186473363fadd5ceaa496c276a60 Mon Sep 17 00:00:00 2001
From: Matthias Geier <Matthias.Geier@gmail.com>
Date: Fri, 19 Jun 2020 22:36:23 +0200
Subject: [PATCH 2/3] FIXUP: remove "compact" class

---
 sphinx/themes/basic/static/basic.css_t | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index a1b8ce10a..5345a9840 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -538,9 +538,7 @@ ul ul > li:last-child > :last-child {
 }
 
 ol.simple > li > p,
-ul.simple > li > p,
-ol.compact > li > p,
-ul.compact > li > p {
+ul.simple > li > p {
     margin-top: 0;
     margin-bottom: 0;
 }

From 82768d8cffe46646db46a4b8baf73435888e2ffc Mon Sep 17 00:00:00 2001
From: Matthias Geier <Matthias.Geier@gmail.com>
Date: Fri, 19 Jun 2020 23:12:41 +0200
Subject: [PATCH 3/3] basic CSS: better handling of list margins, including
 "simple" lists

Fixes #7838.
---
 sphinx/themes/basic/static/basic.css_t | 33 ++++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 5345a9840..e0f24c8a1 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -513,33 +513,30 @@ ol.upperroman {
     list-style: upper-roman;
 }
 
-ol > li:first-child > :first-child,
-ul > li:first-child > :first-child {
+:not(li) > ol > li:first-child > :first-child,
+:not(li) > ul > li:first-child > :first-child {
     margin-top: 0px;
 }
 
-ol ol > li:first-child > :first-child,
-ol ul > li:first-child > :first-child,
-ul ol > li:first-child > :first-child,
-ul ul > li:first-child > :first-child {
-    margin-top: revert;
-}
-
-ol > li:last-child > :last-child,
-ul > li:last-child > :last-child {
+:not(li) > ol > li:last-child > :last-child,
+:not(li) > ul > li:last-child > :last-child {
     margin-bottom: 0px;
 }
 
-ol ol > li:last-child > :last-child,
-ol ul > li:last-child > :last-child,
-ul ol > li:last-child > :last-child,
-ul ul > li:last-child > :last-child {
-    margin-bottom: revert;
+ol.simple ol p,
+ol.simple ul p,
+ul.simple ol p,
+ul.simple ul p {
+    margin-top: 0;
 }
 
-ol.simple > li > p,
-ul.simple > li > p {
+ol.simple > li:not(:first-child) > p,
+ul.simple > li:not(:first-child) > p {
     margin-top: 0;
+}
+
+ol.simple p,
+ul.simple p {
     margin-bottom: 0;
 }