[dpdk-stable] patch 'doc: fix matrix CSS for recent sphinx' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:22:20 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4d3460a1f56b987ae0ad0ecb171f039d5fd9f4ff

Thanks.

Kevin.

---
>From 4d3460a1f56b987ae0ad0ecb171f039d5fd9f4ff Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 12 Mar 2020 00:01:34 +0100
Subject: [PATCH] doc: fix matrix CSS for recent sphinx

[ upstream commit cc64c593a7785fc810e2f762e12c8b29b418ac5d ]

It seems sphinx >= 2.0 is inserting a <p> tag in each table cell.
The feature table (matrix) style needs to be updated to avoid
cells being too big.

The margin, padding and line height are overridden.
The font size in percentage is replaced with an equivalent pixel size.
The border is explicit because it disappeared for th.

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 doc/guides/conf.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 91b2f1153e..5fc597cbe7 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -319,14 +319,20 @@ def print_table_css(outfile, table_id):
          overflow: hidden;
       }
+      table#idx p {
+         margin: 0;
+         line-height: inherit;
+      }
       table#idx th, table#idx td {
          text-align: center;
+         border: solid 1px #ddd;
       }
       table#idx th {
-         font-size: 72%;
+         padding: 0.5em 0;
+      }
+      table#idx th, table#idx th p {
+         font-size: 11px;
          white-space: pre-wrap;
          vertical-align: top;
-         padding: 0.5em 0;
          min-width: 0.9em;
-         width: 2em;
       }
       table#idx col:first-child {
@@ -337,7 +343,9 @@ def print_table_css(outfile, table_id):
       }
       table#idx td {
-         font-size: 70%;
          padding: 1px;
       }
+      table#idx td, table#idx td p {
+         font-size: 11px;
+      }
       table#idx td:first-child {
          padding-left: 1em;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.866310748 +0100
+++ 0033-doc-fix-matrix-CSS-for-recent-sphinx.patch	2020-05-28 17:12:59.093556581 +0100
@@ -1 +1 @@
-From cc64c593a7785fc810e2f762e12c8b29b418ac5d Mon Sep 17 00:00:00 2001
+From 4d3460a1f56b987ae0ad0ecb171f039d5fd9f4ff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc64c593a7785fc810e2f762e12c8b29b418ac5d ]
+
@@ -20 +22 @@
-index 08dcfcff54..9093ad31a0 100644
+index 91b2f1153e..5fc597cbe7 100644
@@ -23 +25 @@
-@@ -315,14 +315,20 @@ def print_table_css(outfile, table_id):
+@@ -319,14 +319,20 @@ def print_table_css(outfile, table_id):
@@ -47 +49 @@
-@@ -333,7 +339,9 @@ def print_table_css(outfile, table_id):
+@@ -337,7 +343,9 @@ def print_table_css(outfile, table_id):



More information about the stable mailing list