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

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 14:54:21 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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.

Thanks.

Luca Boccassi

---
>From 8eefb8787a155174920b16919a53cafc0654c631 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 797ad1ef4b..c1a82be95b 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -314,16 +314,22 @@ def print_table_css(outfile, table_id):
          cursor: default;
          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 {
          width: 0;
@@ -332,9 +338,11 @@ def print_table_css(outfile, table_id):
          vertical-align: bottom;
       }
       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;
          text-align: left;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:21.695434064 +0100
+++ 0071-doc-fix-matrix-CSS-for-recent-sphinx.patch	2020-05-19 13:56:18.299503260 +0100
@@ -1,8 +1,10 @@
-From cc64c593a7785fc810e2f762e12c8b29b418ac5d Mon Sep 17 00:00:00 2001
+From 8eefb8787a155174920b16919a53cafc0654c631 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.
@@ -17,7 +19,7 @@
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/doc/guides/conf.py b/doc/guides/conf.py
-index 08dcfcff54..9093ad31a0 100644
+index 797ad1ef4b..c1a82be95b 100644
 --- a/doc/guides/conf.py
 +++ b/doc/guides/conf.py
 @@ -314,16 +314,22 @@ def print_table_css(outfile, table_id):


More information about the stable mailing list