From ef03e8e3f6fd40c6410fa3c86f953a557a8d2eea Mon Sep 17 00:00:00 2001 From: manetta Date: Fri, 29 Jan 2021 15:22:49 +0100 Subject: [PATCH] changes in the make and print.css --- Makefile | 2 +- themes/basic/static/css/print.css | 62 ++++++++++++++++--------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index ab5200e..b8408ce 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ md2html=$(md:%.md=%.html) md2pdf=$(md:%.md=%.pdf) %.html: %.md - pandoc --from markdown --to html -c themes/basic/static/css/print.css $< -o $@ + pandoc --from markdown --to html -c ../themes/basic/static/css/print.css -s $< -o $@ %.pdf: %.md themes/basic/static/css/print.css pandoc --pdf-engine=weasyprint -c themes/basic/static/css/print.css $< -o $@ diff --git a/themes/basic/static/css/print.css b/themes/basic/static/css/print.css index 2209dc9..ec4562b 100644 --- a/themes/basic/static/css/print.css +++ b/themes/basic/static/css/print.css @@ -56,33 +56,31 @@ } @page :left { - margin-left: 0.5in; - margin-right: 0.5in; + margin-left: 0.5in; + margin-right: 0.5in; - - @top-left { - content: element(pageheader-issue, first-except); - font-size: 8px; - } + @top-left { + content: element(pageheader-issue, first-except); + font-size: 8px; + } @top-right { - content: element(pageheader-theme, first-except); - font-size: 8px; - - } + content: element(pageheader-theme, first-except); + font-size: 8px; + } } @page :right { - margin-left: 0.5in; - margin-right: 0.5in; + margin-left: 0.5in; + margin-right: 0.5in; - @top-right { - content: element(pageheader-issue, first-except); - font-size: 8px; + @top-right { + content: element(pageheader-issue, first-except); + font-size: 8px; - } + } @top-left { - content: element(pageheader-theme, first-except); - font-size: 8px; + content: element(pageheader-theme, first-except); + font-size: 8px; } } @@ -164,6 +162,8 @@ .subheading { font-family: 'White Rabbit'; font-size: 14px; + line-height: 22px; + margin:1em 0; page-break-after: avoid; } @@ -243,9 +243,10 @@ .essay_content { font-family: 'Unifont'; font-size: 14px; - line-height: 1.6; + line-height: 22px; page-break-before: always; hyphens: auto; + columns: 2 auto; } .essay_content_zug { @@ -254,23 +255,20 @@ line-height: 1.5; page-break-before: always; hyphens: auto; - } .about_content { font-family: 'Unifont'; font-size: 14px; - line-height: 1.6; -} - -#first_par { - margin-top: 80px; + line-height: 21px; } #first_letter { - float:left; - margin-bottom: 20px; + display: inline-block; + vertical-align: text-bottom; + margin-bottom: 0px !important; margin-right: 10px; + margin-left: 0px !important; } #first_letter_mel { @@ -286,7 +284,7 @@ } .essay_content p:first-of-type { - margin-top: 80px; + margin-top: -20px; } @@ -376,11 +374,14 @@ q { margin-right: 30px; } p { - margin: 0.5em; + margin: 11px 0.5em 11px 0.5em; + font-size: 14px; + line-height: 22px; } sup { text-decoration: none; color: black; + line-height: 0; } .ref-position { position: relative; @@ -393,6 +394,7 @@ sup { page-break-before: avoid; line-height: 0.9; position: inherit; + columns: 3 auto; } [role=doc-endnotes] {