From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4AABFA0093 for ; Thu, 28 May 2020 18:25:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A2C331DC32; Thu, 28 May 2020 18:25:08 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 2FD341DC1E for ; Thu, 28 May 2020 18:25:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C8VUpsIav7oCmwL6PC9z93xJo6547HwGpziSDulXVu0=; b=Y9Hq3ZvGvI7u4WiwNfNetWfrEJXhJVMwbwS6P/cx4TdyYk55gIEdR+1so4s5vEDrQJfCkZ yOCJ1gJ8INYImxpGvIl/h5XDidsCpslnu4BX7cykqQWBFFuVGvufH8POsn10Ju06694tSc nEGtw4KefHDic6DnyxhdWj0UcRt5JcA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-445-4EZZLLMSOEKz0YS4auGRRg-1; Thu, 28 May 2020 12:25:01 -0400 X-MC-Unique: 4EZZLLMSOEKz0YS4auGRRg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A697F108BD0A; Thu, 28 May 2020 16:25:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA54160C05; Thu, 28 May 2020 16:24:59 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: dpdk stable Date: Thu, 28 May 2020 17:22:20 +0100 Message-Id: <20200528162322.7863-33-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix matrix CSS for recent sphinx' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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

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 --- 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):