unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 69432@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#69432] [PATCH 3/3] website: Use Linux Libertine for the body of the manual.
Date: Tue, 27 Feb 2024 22:38:35 +0100	[thread overview]
Message-ID: <20240227213835.21147-3-ludo@gnu.org> (raw)
In-Reply-To: <20240227213835.21147-1-ludo@gnu.org>

* website/static/base/css/manual.css: New @fontface entries for Linux
Libertine.  Use it for section bodies.  Add rule for ‘samp’, etc.
* website/static/base/css/code.css (.symbol-definition-prototype):
Remove ‘font-size’.
* website/.guix.scm (lingua-web-site)[build]: Install Linux Libertine
fonts.
---
 website/.guix.scm                  | 13 ++++++++++-
 website/static/base/css/code.css   |  1 -
 website/static/base/css/manual.css | 35 +++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 438d337..4c74391 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -213,7 +213,18 @@
                                                      file)
                                       (string-append #$output
                                                      "/static/base/fonts")))
-                      '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf"))))))
+                      '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf"))
+
+            (for-each (lambda (file)
+                        (install-file (string-append #+font-linuxlibertine
+                                                     "/share/fonts/truetype/"
+                                                     file)
+                                      (string-append #$output
+                                                     "/static/base/fonts")))
+                      '("LinLibertine_R.ttf"
+                        "LinLibertine_RI.ttf"
+                        "LinLibertine_RB.ttf"
+                        "LinLibertine_RBI.ttf"))))))
 
   (computed-file (string-append "guix-web-site-" lingua)
                  build
diff --git a/website/static/base/css/code.css b/website/static/base/css/code.css
index e7c53ac..efdb70a 100644
--- a/website/static/base/css/code.css
+++ b/website/static/base/css/code.css
@@ -72,7 +72,6 @@ a[href].syntax-symbol:hover {
 
 .symbol-definition-prototype { /* remaining arguments to @deffn etc. */
     font-family: monospace;
-    font-size: 110%;
 }
 
 .symbol-definition + dd {
diff --git a/website/static/base/css/manual.css b/website/static/base/css/manual.css
index 8970457..0e5b9df 100644
--- a/website/static/base/css/manual.css
+++ b/website/static/base/css/manual.css
@@ -316,6 +316,31 @@ label[for=all-dropdowns-hidden] {
     font-style: normal;
 }
 
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/Linux Libertine O_R.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/Linux Libertine O_RI.ttf') format('truetype');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/Linux Libertine O_RB.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/Linux Libertine O_RBI.ttf') format('truetype');
+    font-weight: bold;
+    font-style: italic;
+}
+
 /* In title and node titles, use Fira Sans as it is more pleasant and
    more compact than Helvetica.  */
 h1.settitle, h1.top, h2.chapter, h3.section, h4.subsection, h4.subsubsection {
@@ -327,7 +352,15 @@ h1.settitle, h1.top, h2.chapter, h3.section, h4.subsection, h4.subsubsection {
    which currently applies to entire section classes, as opposed to section
    classes for headings only).  */
 div.settitle, div.top, div.chapter, div.section, div.subsection, div.subsubsection {
-    font-family: serif;
+    font-family: Linux Libertine O, serif;
+    font-size: 18px;
+}
+
+/* Arrange so fixed-width samples don't look too big compared to Linux
+   Libertine text.  */
+samp, code, .example {
+    font-family: monospace;
+    font-size: 85%;
 }
 
 /* Texinfo footnotes are in a "footnote" <div> but each of them is
-- 
2.41.0





  parent reply	other threads:[~2024-02-27 21:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27 16:51 [bug#69432] [PATCH 0/3] Change fonts of the on-line manual Ludovic Courtès
2024-02-27 21:38 ` pelzflorian (Florian Pelz)
2024-02-27 21:38 ` [bug#69432] [PATCH 1/3] website: Adjust style of web site builder Ludovic Courtès
2024-02-27 21:38   ` [bug#69432] [PATCH 2/3] website: Use Fira Sans for section headings only Ludovic Courtès
2024-02-27 21:38   ` Ludovic Courtès [this message]
2024-02-28  7:56     ` [bug#69432] [PATCH 3/3] website: Use Linux Libertine for the body of the manual pelzflorian (Florian Pelz)
2024-02-29 21:41       ` Ludovic Courtès
2024-02-29 21:47         ` [bug#69432] [PATCH guix-artwork v2 1/3] website: Adjust style of web site builder Ludovic Courtès
2024-02-29 21:47           ` [bug#69432] [PATCH guix-artwork v2 2/3] website: Use Fira Sans for section headings only Ludovic Courtès
2024-02-29 21:47           ` [bug#69432] [PATCH guix-artwork v2 3/3] website: Use Linux Libertine for the body of the manual Ludovic Courtès
2024-03-01 11:51             ` pelzflorian (Florian Pelz)
2024-03-02 15:01               ` bug#69432: " Ludovic Courtès
2024-02-28  8:06   ` [bug#69432] [PATCH 1/3] website: Adjust style of web site builder pelzflorian (Florian Pelz)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240227213835.21147-3-ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=69432@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).