Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1j2m9M-0002aF-Kk for pgsql-docs@arkaria.postgresql.org; Sat, 15 Feb 2020 01:21:41 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1j2m9L-0003LI-0a for pgsql-docs@arkaria.postgresql.org; Sat, 15 Feb 2020 01:21:39 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1j2m9K-0003Et-8a for pgsql-docs@lists.postgresql.org; Sat, 15 Feb 2020 01:21:38 +0000 Received: from meldrar.postgresql.org ([2a02:c0:301:0:ffff::31]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1j2m9C-00037o-PW for pgsql-docs@lists.postgresql.org; Sat, 15 Feb 2020 01:21:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=postgresql.org; s=20171124; h=Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=dtza5sGYRNgreW5OIu0cYCtHqrUSIH/79UmciHPzAnE=; b=EL2frgVkpczC4F56VBrDECjkQ0 cGGaN0uERgHlPCLT2RFggG5QqwoBQ0+eFMYuLxQk98OwV/3JWOlvfP2bUGNtDmyWDtFMGe87FpcCI LqAXBNutoDZA4i30ZIrJ5PJN1c15h5jH0oVCVHmKknghwRS7iEuQO/ah42JCxEOkAMR3Boa5kOjRk oy3PsLK08iuMWXvwkLAzKg3i+O1wfKRbL+Neq9if8+/lPxK5bvig2tYlX/gsi5YnP2K3uWsqokkQ+ PxHmoJHQETgNiTfRX72kfTy8TMpepxwmOZqeyAHUwvKHeMoHug7uIcD7i5NdfuusA/T7vRtW/ZTEK JfI8RPrQ==; Received: from pool-173-56-10-231.nycmny.fios.verizon.net ([173.56.10.231] helo=Ph33rHippo.home) by meldrar.postgresql.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1j2m98-0001J1-AO; Sat, 15 Feb 2020 01:21:29 +0000 Subject: Re: Duplicating website's formatting in local doc builds To: Tom Lane Cc: Peter Geoghegan , Pg Docs References: <1375.1581446233@sss.pgh.pa.us> <3873.1581449531@sss.pgh.pa.us> <4b44c4ec-a678-6586-fbb0-efc3299af203@postgresql.org> <86f03290-e60c-855e-786a-d1b75c254811@postgresql.org> <716a39ec-6f56-0280-8d4b-b246176c6a3d@postgresql.org> <11007.1581721578@sss.pgh.pa.us> From: "Jonathan S. Katz" Autocrypt: addr=jkatz@postgresql.org; keydata= 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 FmEC Message-ID: <8d663c68-3df0-bf3f-8c2e-e6897a55394a@postgresql.org> Date: Fri, 14 Feb 2020 20:21:23 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: <11007.1581721578@sss.pgh.pa.us> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="SDUNgvuqCvqHqglEobD3bNNU5LU4z6j4t" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --SDUNgvuqCvqHqglEobD3bNNU5LU4z6j4t Content-Type: multipart/mixed; boundary="iVNC9C8uK6QVIe8K0WnHTvJggT4BlbE52" --iVNC9C8uK6QVIe8K0WnHTvJggT4BlbE52 Content-Type: multipart/mixed; boundary="------------DFFBF2BDDC6ECE60C038996B" Content-Language: en-US This is a multi-part message in MIME format. --------------DFFBF2BDDC6ECE60C038996B Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 2/14/20 6:06 PM, Tom Lane wrote: > "Jonathan S. Katz" writes: >> To load the webfont, the "main.css" file uses a CSS "@import" >> instruction, which has a limitation that it can only be used as the to= p >> of the file. As main.css is not the first file in the "docs.csS" >> sandwich, it does not load. >> Buried in some version of the DocBook[1] documentation were in >> instructions on how to load in multiple stylesheets via >> >> which I followed in our XSLT, which lead to that portion of the diff. >=20 > It looks to me like the main text font now matches, but the font used f= or > text doesn't quite -- see the attached, and note for example = the > capital T's in CREATE TYPE. (Local build with this patch on the left, > website on the right.) Still, it's enormously closer than before. Hmm, I'm not getting that. They're both identical for me, at least in Chrome... =2E..but I hopped over into Safari, and I saw a difference between the local file in Chrome, and what .org looks like in Safari. I dove into this a bit. For this view, we are just using the default "monospace" font that is referenced by a particular browser. It seems like there was a change in Safari 12 where you can no longer override the default monospace font. It appears to be using "SF Mono." In Chrome, it appears that it is using Courier. A potential solution is that we drop the use of "monospace" in relying on the OS default and just pick a font. I would say that this is outside the scope of the patch that's being proposed, but certainly something to look into on the pgweb side given we're creating an inconsistent cross-browser experience. >=20 >> Not included is one of Tom's original questions, which is should we ju= st >> make using the website styles the default? As it stands, this would >> require network connectivity to preview the look for a page. If we wan= t >> to ensure consistent views across the board, then I would say we impor= t >> the stylesheets, knowing that "main.css" is volatile. >=20 > The point about network access seems to me to be sufficient reason not > to make it the default. I'd actually say that we ought to annotate > section J.3.1 to point out that "make STYLE=3Dwebsite" will result in > that. However, I'm not quite clear on whether that means external > access during viewing, or during build, or both? The note should say. It would only be during viewing -- the build just puts the URL into the HTML file. But don't take my word for it, please see the attached patch ;) Jonathan --------------DFFBF2BDDC6ECE60C038996B Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="website-formatted-docs-v5.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="website-formatted-docs-v5.patch" diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index c99198f5e5..17f2bf42ac 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -276,6 +276,43 @@ checking for fop... fop doc/src/sgml$ make STYLE=3Dwebsite html + + + Viewing the documentation built using the postgresql.org + stylesheet requires Internet connectivity, as the HTML pages contain= + references to remotely hosted stylesheets, including: + + + + + https://www.postgresql.org/media/css/fontawesome.css + + + + + + + https://www.postgresql.org/media/css/bootstrap.min.css + + + + + + + https://www.postgresql.org/media/css/main.css + + + + + + + https://www.postgresql.org/media/css/normalize.css + + + + + =20 diff --git a/doc/src/sgml/stylesheet-html-common.xsl b/doc/src/sgml/style= sheet-html-common.xsl index 9edce52a10..d9961089c6 100644 --- a/doc/src/sgml/stylesheet-html-common.xsl +++ b/doc/src/sgml/stylesheet-html-common.xsl @@ -18,6 +18,14 @@ pgsql-docs@lists.postgresql.org 2 =20 + + + docContent + container-fluid col-10 + =20 =20 diff --git a/doc/src/sgml/stylesheet.xsl b/doc/src/sgml/stylesheet.xsl index 4ff6e8ed24..bc5a904e0b 100644 --- a/doc/src/sgml/stylesheet.xsl +++ b/doc/src/sgml/stylesheet.xsl @@ -23,11 +23,15 @@ stylesheet.css - https://www.postgresql.org/media/css/docs.css + + https://www.postgresql.org/media/css/fontawesome.css + https://www.postgresql.org/media/css/bootstrap.min.css + https://www.postgresql.org/media/css/main.css + https://www.postgresql.org/media/css/normalize.css + =20 - --------------DFFBF2BDDC6ECE60C038996B-- --iVNC9C8uK6QVIe8K0WnHTvJggT4BlbE52-- --SDUNgvuqCvqHqglEobD3bNNU5LU4z6j4t Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE+oS2la8r95ogZD/x8QSccp8cZScFAl5HR5MACgkQ8QSccp8c ZScG8BAAjK7w02luK/j8qvQvIuZlgn4f2lyTF+W/F/3LHjU1FsTbIBq0JtMudOlj RYH4EPkze0CfgfMpyImVEEr/WdyUQa85uw4qPbhY6Ns63pC6e2yTDcuxhmWZmTrA JLIpUB0IaSQJQzw1VoqbHuRLPB/qvodnF7haNHYXLwmsJuzfG5JAxqGcwdiLR0Bv 2ShHCaXdHQEUkjOUcAlDQ34dj/VE+pdygGkWMav4I0/3/nYdmklZ8Zs6C260uXfq fcunDntiok9V24SLkjf9sVhdYIIzIC9nYsxPZ8rdBd7c9W3zu7SvyUCfBdC3PoJ6 ErsnCS/DUJ1PTUiEMQuav9E1BROQ5DX7vS8bjTFHOzu2poJYdjrXfwT6GuJ2vnZ2 dxJVWcD6DEVogxeAWkLZ9ZrRXkz/4WtpH/hU+rAfGMg2nbPK7squoQdQ6f7tDsvy zjNpKV2/waw4lBcTZvxjYXeLC4ZCPujB9P14nVysrtlNfQyVptTy8ZeUJKVDokw/ m5KNFlcKY2t9dyfzkfBcdZA7DwmfpNe5nrJ2/7u0jWarAXf8DcpenniumN32Fhn/ gBm15VFBHWvH8rlTlsU/HOdsJ06xWHUy11wWKoKkReZRYcxuYgaId9t5RQBudeWv x4NDEfbBffA1a/Q8NJrdSCGKmhQ2l04NInJ0iXHDji1vb24vePY= =DRjQ -----END PGP SIGNATURE----- --SDUNgvuqCvqHqglEobD3bNNU5LU4z6j4t--