From 06bcc2dee33d91b8d2632c92d44bd85eee23d8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Jan 2019 09:02:44 +0000 Subject: [PATCH] manual: limit text width Currently the manual scales to the view port of the browser. This leads to an unreadable layout and I found myself reading the xml source instead. The optimal width would be around 50 characters per line. Since we have code listings also in the manual I relaxed this limit a bit towards 70 characters per line. --- doc/configuration.xml | 44 +++++++++++++++++++++++++++++++++++++++---- doc/style.css | 24 +++++++++++++++++++++-- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index 624a5bb270a..8a5ff8dcb8e 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -180,7 +180,11 @@ code: { - allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]); + allowUnfreePredicate = (pkg: builtins.elem + (builtins.parseDrvName pkg.name).name [ + "flashplayer" + "vscode" + ]); } @@ -322,7 +326,18 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; }; }; } @@ -343,7 +358,18 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; pathsToLink = [ "/share" "/bin" ]; }; }; @@ -378,7 +404,17 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; extraOutputsToInstall = [ "man" "doc" ]; }; diff --git a/doc/style.css b/doc/style.css index 0db907815b6..474dd32e3fb 100644 --- a/doc/style.css +++ b/doc/style.css @@ -9,6 +9,7 @@ body { font-family: "Nimbus Sans L", sans-serif; + font-size: 1em; background: white; margin: 2em 1em 2em 1em; } @@ -28,6 +29,25 @@ h2 /* chapters, appendices, subtitle */ font-size: 180%; } +div.book +{ + text-align: center; +} + +div.book > div +{ + /* + * based on https://medium.com/@zkareemz/golden-ratio-62b3b6d4282a + * we do 70 characters per line to fit code listings better + * 70 * (font-size / 1.618) + * expression for emacs: + * (* 70 (/ 1 1.618)) + */ + max-width: 43.2em; + text-align: left; + margin: auto; +} + /* Extra space between chapters, appendices. */ div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 { @@ -102,8 +122,8 @@ pre.screen, pre.programlisting { border: 1px solid #b0b0b0; padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; + margin-left: 0.5em; + margin-right: 0.5em; background: #f4f4f8; font-family: monospace;