diff mbox series

[bug#69432,guix-artwork,v2,3/3] website: Use Linux Libertine for the body of the manual.

Message ID 20240229214714.9431-3-ludo@gnu.org
State New
Headers show
Series [bug#69432,guix-artwork,v2,1/3] website: Adjust style of web site builder. | expand

Commit Message

Ludovic Courtès Feb. 29, 2024, 9:47 p.m. UTC 
* website/static/base/css/manual.css: New @font-face 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 | 37 ++++++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

Comments

pelzflorian (Florian Pelz) March 1, 2024, 11:51 a.m. UTC | #1 
Ludovic Courtès <ludo@gnu.org> writes:
> * website/static/base/css/manual.css: New @font-face entries for Linux
> Libertine.  Use it for section bodies.

Okay.  I cannot decide with regard to which font to use, but with this
one, the result looks good.

> Add rule for ‘samp’, etc.

Appropriate.

All patches LGTM. :)

Regards,
Florian
Ludovic Courtès March 2, 2024, 3:01 p.m. UTC | #2 
Hello,

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>> * website/static/base/css/manual.css: New @font-face entries for Linux
>> Libertine.  Use it for section bodies.
>
> Okay.  I cannot decide with regard to which font to use, but with this
> one, the result looks good.
>
>> Add rule for ‘samp’, etc.
>
> Appropriate.
>
> All patches LGTM. :)

Pushed as b9a55b9091ec739f10802c5057faf85b0c5695f3, thanks!

Ludo’.
diff mbox series

Patch

diff --git a/website/.guix.scm b/website/.guix.scm
index 1d8c3e6..e74f01f 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -212,7 +212,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..333f545 100644
--- a/website/static/base/css/manual.css
+++ b/website/static/base/css/manual.css
@@ -1,7 +1,7 @@ 
 /* Additional CSS for the on-line manual.  It complements GNU's
    default CSS at <https://www.gnu.org/software/gnulib/manual.css>.
 
-   Public domain 2017, 2022. All rights waived.  */
+   Public domain 2017, 2022, 2024.  All rights waived.  */
 
 /* Navigation bar for the language menu, copied from navbar.css with
    minor changes.  */
@@ -316,6 +316,31 @@  label[for=all-dropdowns-hidden] {
     font-style: normal;
 }
 
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/LinLibertine_R.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/LinLibertine_RI.ttf') format('truetype');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/LinLibertine_RB.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Linux Libertine O';
+    src: url('../fonts/LinLibertine_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