From 9dd768863c613e00d1f9c33ed1d1fbbdc663cbf9 Mon Sep 17 00:00:00 2001
From: Jakob Lykke Andersen <Jakob@caput.dk>
Date: Fri, 2 Aug 2019 14:45:10 +0200
Subject: [PATCH] Fix field lists after switch to HTML5 writer

- classic: Put the pink'ish colour back on the field type part (dt).
- basic: remove top margin on the field data to align with the type.
- basic: use grid display instead of flexbox to avoid fixed width on
  the field type part.

Other themes affected/fixed due to changes in basic:
- bizstyle (only technically, it already was fixed in
  sphinx-doc/sphinx#6262)
- haiku
- classic
- nature
- pyramid
- sphinxdoc

Fixes sphinx-doc/sphinx#6604
---
 sphinx/themes/basic/static/basic.css_t       | 11 ++++++-----
 sphinx/themes/bizstyle/static/bizstyle.css_t |  5 -----
 sphinx/themes/classic/static/classic.css_t   |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 91fd35755cc..1c278e88b8a 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -520,14 +520,15 @@ dl.citation > dd:after {
 }
 
 dl.field-list {
-    display: flex;
-    flex-wrap: wrap;
+    display: grid;
+    grid-template-columns: fit-content(30%) auto;
 }
 
 dl.field-list > dt {
-    flex-basis: 20%;
     font-weight: bold;
     word-break: break-word;
+    padding-left: 0.5em;
+    padding-right: 5px;
 }
 
 dl.field-list > dt:after {
@@ -535,8 +536,8 @@ dl.field-list > dt:after {
 }
 
 dl.field-list > dd {
-    flex-basis: 70%;
-    padding-left: 1em;
+    padding-left: 0.5em;
+    margin-top: 0em;
     margin-left: 0em;
     margin-bottom: 0em;
 }
diff --git a/sphinx/themes/bizstyle/static/bizstyle.css_t b/sphinx/themes/bizstyle/static/bizstyle.css_t
index f2b4006880e..b1ae4968967 100644
--- a/sphinx/themes/bizstyle/static/bizstyle.css_t
+++ b/sphinx/themes/bizstyle/static/bizstyle.css_t
@@ -412,15 +412,10 @@ p.versionchanged span.versionmodified {
 
 dl.field-list > dt {
     color: white;
-    padding-left: 0.5em;
-    padding-right: 5px;
     background-color: #82A0BE;
 }
 
 dl.field-list > dd {
-    padding-left: 0.5em;
-    margin-top: 0em;
-    margin-left: 0em;
     background-color: #f7f7f7;
 }
 
diff --git a/sphinx/themes/classic/static/classic.css_t b/sphinx/themes/classic/static/classic.css_t
index a062d6d14be..84a4dd0ec95 100644
--- a/sphinx/themes/classic/static/classic.css_t
+++ b/sphinx/themes/classic/static/classic.css_t
@@ -292,7 +292,7 @@ code {
     font-size: 0.95em;
 }
 
-th {
+th, dl.field-list > dt {
     background-color: #ede;
 }