From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 15 May 2023 12:22:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pyVLa-001eIo-GU for lore@lore.pengutronix.de; Mon, 15 May 2023 12:22:29 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pyVLX-0006vU-Fy; Mon, 15 May 2023 12:22:27 +0200 Received: from mail-fr2deu01on2064.outbound.protection.outlook.com ([40.107.135.64] helo=DEU01-FR2-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pyVKu-0006vC-7r; Mon, 15 May 2023 12:21:48 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fMKKt/VY1TInLgcf6HFggtV65QVyaNiYC3093krwGQMU7rftiSPE4lLcqfKwdJumViX0vBa6oJuXYVZ1zDcLr1rlO7ovXgS8qybf0zcy3PRLhrgqlqAu9XtkaMBGmXFiAFAruKVYZcSTxs3PMJHn1MWZV1kRcta5elCXKkSbfTx84r9WFdIIda6bm7o2gA8bEwNuq0pKwNtoK0448vJX5hwqhXro1+tFqkuFFA7Wqj1EU0OQt+p0wKUsIPDTn4n8sqqD6jIQq49ABk6L2DF6WW70bInHimPhtte08f/ImiWFVo+EK4Kyo4yomCirLox2S5eX2adVrzEH8cJXBEyYyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Sz8TuRv+YgKddvoh0Sk5EGxDhX3tLFZQNLf68dy2NAE=; b=LEOlixSHdbrfuv59WzNUTYEWAoTcv2VNUsvpjeG9mYuMnrB99BuwgLf9UgLrhwJr0EkXJRIw75oUc7sKRbK7WMtRP0FWXDbeDgCb6JK+jjCqVhubgURjmOO+lz1xZI0LTpWRz/jach72yVAYkuQokM5wFBph/G40z7A5NoYUH5OvpbEenWsGGnl9dRKGG8kns2mKwH2SSo0ZydwSKod6P89ruZ9tKbUGDe3wW9Ei8a6X5WFek3sIy/nrK8QPLn0epcgO8Qnxj5Ss9QFljdjdFAH5rUohTKFmz7EBSnQy/es8Q1diFqJu1kx+otvc1iSk64cemhZailuSwjiS4NUreA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmann.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sz8TuRv+YgKddvoh0Sk5EGxDhX3tLFZQNLf68dy2NAE=; b=vxOmEeRlWRZ3UvYR30ZXlThOC0jR3WqQj88M7nnGUNS8DyrmGVJRDP+IHeIxwAQ5DAUThP02MczprZD7jZXEFUS8OClOyW9K/zOQB4LQI6u5Gg4TUX8B29hqep9TJrZ83KTz5QMpitj4SlmVViAyJvoWxhHDioGZh8MaFIkDHyI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:56::12) by FRYP281MB2240.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:43::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Mon, 15 May 2023 10:21:46 +0000 Received: from FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM ([fe80::610b:489d:7e20:28ba]) by FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM ([fe80::610b:489d:7e20:28ba%7]) with mapi id 15.20.6387.029; Mon, 15 May 2023 10:21:46 +0000 Date: Mon, 15 May 2023 12:21:45 +0200 From: Jonas Schmidt To: ptxdist@pengutronix.de Message-ID: <20230515102145.ysykgww5yi2b6kha@NB345> References: <20230506202223.263380-1-rhi@pengutronix.de> Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230506202223.263380-1-rhi@pengutronix.de> X-ClientProxiedBy: FR0P281CA0229.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::14) To FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:56::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: FR0P281MB3275:EE_|FRYP281MB2240:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d0abf8f-858c-4498-2ae2-08db552e2fd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gLN13YmbWocTBVrolxZDtk2pfuG6tZKYUcpXVGHnCbHILVNYNRzLCJKoDWTLEv1txc7qlAuLeOwGCAfgAnj6EWSiobWWwX/150aEPLKN1QTcYgreAH8N6cpB+12tjYmVKEZdZR1sbw6ACv3tjH9Om0tQXmM6746tlbWCWRepr90otinm2v4p5PFlVZBozruowJYvSzdpYirC2omrfj8aopB4/Gn1XSOF4uk++uH1gwJcZyz8epQg0ZjFHjQCFq1vfS5o9aH5U+/y4+DrS9N9ddqP7MgTsFh/mUBWgiYDDCelzxwt9W/Ra0nUUvXSi6D7e9qLgdvf66mVX/I3dW8OJecCRVg/RcQf8p9PcccvBHkuMXuQo7Egnz3TvsQz63V+hwiy8Gpfb1b3V/SgjAkXB9KapCf/0GLWoSSNklbsNTIjQEwSN1lXH0/3VvveUn0pfxIKfrJOn9ZekK4PDX/G3KfDVxeh1mUdZw7u5zG9dFk/9tihdcJwING9/t0rD8FVYMmmcenUZverbKx9ba2DmpKkIKWxeHKR0vug+0raVo/J91pgOH1bvFcAoM+Cy5JQ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(4636009)(7916004)(366004)(346002)(396003)(136003)(39850400004)(376002)(451199021)(33716001)(83380400001)(66476007)(66556008)(66946007)(450100002)(6486002)(1076003)(6512007)(6506007)(478600001)(5660300002)(186003)(2906002)(86362001)(8936002)(8676002)(9686003)(4326008)(6916009)(316002)(41300700001)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?5UJNYcuhpkOqiZUdpZUv1Mv18Me2rkU8vAv1RZUGn5CGfOpi+oXZVRq8g5?= =?iso-8859-1?Q?0ohTXnFVPoWxdT6LyfBYXgVg1jJYQwYBFh8aIv6ghED2eM3WG8UCos5sB6?= =?iso-8859-1?Q?SI+58IiMFL+cn8G9hOkwcheySN+4fmQaurPncKeJ+hWWOmJdwmFKO2YbN0?= =?iso-8859-1?Q?V6MwedofdbRc2sWwS/WiGyS7/ktJGoguzgs0Lz9IuT1VEca1sdE+iYF9yO?= =?iso-8859-1?Q?6fqF/BaqPU4DtM11wZnFVIWYclJq35ECiDe5o+mhWoL8o8OL/Ygy6B5tHL?= =?iso-8859-1?Q?rf7WhUxdRp0mGZk/F5b1cqNOo+AEeU7UpJvWUJ5XmJvi5BWzPvXPg6laXz?= =?iso-8859-1?Q?sPDkaL+4WPqoudHbj1r1P+ZQG0NI9ztv0JnHqF5YAwXiVO8in0FwEDD2+K?= =?iso-8859-1?Q?1HU9OGf8qYJjQ0b74Sp5WpaeAO6UkAMBg9W71gt+uRbBHhfTZBr/Xebzwh?= =?iso-8859-1?Q?MzpTjuaLPbejq0QrGiJ9rntXT45mwPW+huywUGKl/Zf1rdFUg3paDTrOcm?= =?iso-8859-1?Q?AjIzVeaKMCMxVQmGyY6WvObuG6Qsv1lTBHtUyRrggO2rAck7zo5q4VjkVk?= =?iso-8859-1?Q?pttnRWtoprM9Nq32DL6slevjRqrxiYvzgVZWDs6RFTJvc7dv8KE6NsqwVl?= =?iso-8859-1?Q?JfpLHSGI6RVYaCbwwGVQEtO8sDSaqhGiX++6+ThxeoMZQmQOXLTq1taf+r?= =?iso-8859-1?Q?FE6XaRqQrgUaJ1Qs0rSLVvEB9IPRaXWeLHUhE0QMR6tyAU8whet14RZBbG?= =?iso-8859-1?Q?EBMxdU6TFhlDL2F5u3W618KPerXWNc8cq2a8CqXaqvdHEvBy+5ra1u1r8A?= =?iso-8859-1?Q?+O+g91DLQ8IvrkNJ+74blueZa4yCypym1RpvD+RUvwPyHQbYa4ZEAfYQvA?= =?iso-8859-1?Q?qvRQUBgKRU4yWdyTDiV+MIzrga0jK1SE2ijLY1rICR2BtBsHUUGFt5qpYZ?= =?iso-8859-1?Q?YHbNq28E8XMq4hIHFo5As75OmMYef+TwRM/5/RLayHvhZu4vu91+b2U7Mq?= =?iso-8859-1?Q?TSmE+c5UxQlnw6kJdpbcbPgEauNREpK61uLsOiIifdvEyVAcImpufsWBpc?= =?iso-8859-1?Q?n4XL2HutTWyXxvIjBGjG/l8Y74SaEgJF2DI+BgsLD2FgeMyvkgY+DAZEbR?= =?iso-8859-1?Q?+8l8PudT6RzERbUnplPjc03LSQuO62azP2fxwf0j2zNufYBnjoNfeNP3c0?= =?iso-8859-1?Q?bm8V0B208tXyiu2PwA0Cu07QK9ON3A8slgVMSHB0Ypw7+4UcU7NDjdu3eg?= =?iso-8859-1?Q?OhIsO7KPppyKPXFRQl5X+uvhWHAKuV9jbIXQbhKz19R7TrKxu35ZG0ZH0I?= =?iso-8859-1?Q?9VQw60ZDTzWHcS753AJJPHDShfDfT1tjd3SFQaiyNrRsU93tRzCtXenT77?= =?iso-8859-1?Q?8oK287ACZhFHhWnnu5WDSKnonxRXsLbfsWX7aN4N4Gxox+mt5twizusZJj?= =?iso-8859-1?Q?PTRrSmzbVGOxqigQwj1ScYTk1C6meqRIP3BW+slvFtM0e/2qYPb2u3XcLH?= =?iso-8859-1?Q?9LTfx0WLMYaQ8fRdXiu7jNn7UNfx2ldvkqkNrmzFXeWbs5dsL2fSz/l6It?= =?iso-8859-1?Q?45zPMYusT9TYb9AyQW+uyl8Vdhy96apZfr6ouWZcp5DcDY0Viy8lscrGdn?= =?iso-8859-1?Q?Hgz1K/yKT93XU1POd58oUVlLcqEoxM1OFbAGBP1WGf6AzIGiYVBYsbgP53?= =?iso-8859-1?Q?1YSxlNOLAv3JGKWJO5M6VN0nv3dt8Crpbvz4YEMbt5XS/1iXFq4UsQrkjV?= =?iso-8859-1?Q?ksjw=3D=3D?= X-OriginatorOrg: eckelmann.de X-MS-Exchange-CrossTenant-Network-Message-Id: 9d0abf8f-858c-4498-2ae2-08db552e2fd4 X-MS-Exchange-CrossTenant-AuthSource: FR0P281MB3275.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2023 10:21:46.4702 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ElkUQLix/le/aJCLkkxaKn4jitrW1fOr1NVNRIgqfpspI2KFRl1L4HKKDYesXvqAVV6EzRNBkbS2Ln5cmJ9V9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRYP281MB2240 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=4.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 1/3] doc: fix CSS/JS files not getting picked up by sphinx 5.3.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Sat, May 06, 2023 at 10:22:21PM +0200, Roland Hieber wrote: > Somewhen between v3.4.3 (Debian bullseye) and v5.3.0 (Debian bookworm), > sphinx stopped picking up our CSS and JS files from the html_context, > which has the effect that the styling of the HTML documentation looks > very broken when built with sphinx 5.3.0. > > Instead of injecting the CSS and JS files into html_context, use the > dedicated variables html_css_files and html_js_files, which were > introduced in sphinx 1.8 (which came out in 2018). This mostly fixes the > layout with sphinx v5.3.0, apart from a small vertical space glitch in > the "View page source" link, which we will fix later. > > Signed-off-by: Roland Hieber We had a simular issue and I was workting on an fix as well, but you were faster. Tested-by: Jonas Schmidt  Acked-by: Jonas Schmidt  > --- > doc/conf.py | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/doc/conf.py b/doc/conf.py > index 92594f4078a0..3e53aa4db20e 100644 > --- a/doc/conf.py > +++ b/doc/conf.py > @@ -172,15 +172,16 @@ html_theme = 'sphinx_rtd_theme' > > html_static_path = ['_static'] > > -html_context = { > - 'css_files': ['_static/css/custom.css'], > - 'script_files': [ > - '_static/js/jquery-3.1.0.min.js', > - '_static/underscore.js', > - '_static/doctools.js', > - '_static/js/main.js', > - ], > -} > +html_css_files = [ > + 'css/custom.css', > +] > + > +html_js_files = [ > + 'js/jquery-3.1.0.min.js', > + 'underscore.js', > + 'doctools.js', > + 'js/main.js', > +] > > # The name for this set of Sphinx documents. If None, it defaults to > # " v documentation". > -- > 2.39.2 Best regards Jonas Schmidt.