From db3c98961c94ae6d8737869b2327d0a539f1bd3b Mon Sep 17 00:00:00 2001 From: James Seden Smith Date: Wed, 3 May 2017 15:33:42 +0100 Subject: [PATCH] Changed default styling to match university guidelines --- md_pdf/assets/static/style.scss | 10 ++++++++++ md_pdf/build/pdf.py | 14 +++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/md_pdf/assets/static/style.scss b/md_pdf/assets/static/style.scss index 1212730..458b7d6 100644 --- a/md_pdf/assets/static/style.scss +++ b/md_pdf/assets/static/style.scss @@ -6,4 +6,14 @@ body.cover { padding-top: 400px; font-size: 48px; } + & h3 { + font-size: 36px; + } + & h4 { + font-size: 18px; + } +} +body, html { + font-size: 12px; + line-height: 1.5; } diff --git a/md_pdf/build/pdf.py b/md_pdf/build/pdf.py index 39c550d..60c6b4b 100644 --- a/md_pdf/build/pdf.py +++ b/md_pdf/build/pdf.py @@ -7,6 +7,9 @@ import logging logger = logging.getLogger(__file__) +DEFAULT_MARGIN_VERTICAL = '1.5cm' +DEFAULT_MARGIN_HORIZONTAL = '2.5cm' + STYLE_FILE = os.path.join(STATIC_DIR, 'style.css') HEADER_FILE = os.path.join(TEMPLATES_DIR, 'header.html') FOOTER_FILE = os.path.join(TEMPLATES_DIR, 'footer.html') @@ -14,11 +17,6 @@ PDF_OPTIONS = { "quiet": "", "no-pdf-compression": "", - "margin-top": '0.6in', - "margin-bottom": '0.6in', - "margin-left": '0.4in', - "margin-right": '0.4in', - "header-html": HEADER_FILE, "footer-html": FOOTER_FILE, "footer-spacing": 5, @@ -31,6 +29,12 @@ PDF_OPTIONS = { def export_pdf(content, config): PDF_OPTIONS['title'] = config.get('title', 'Output') PDF_OPTIONS['replace'] = [(key, str(value)) for key, value in config['context'].items()] + + PDF_OPTIONS['margin-top'] = config['context'].get('margin_vertical', DEFAULT_MARGIN_VERTICAL) + PDF_OPTIONS['margin-bottom'] = config['context'].get('margin_vertical', DEFAULT_MARGIN_VERTICAL) + PDF_OPTIONS['margin-left'] = config['context'].get('margin_horizontal', DEFAULT_MARGIN_HORIZONTAL) + PDF_OPTIONS['margin-right'] = config['context'].get('margin_horizontal', DEFAULT_MARGIN_HORIZONTAL) + logger.info("Rendering PDF...") return pdfkit.from_string( content,