diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 620ed103..0e0a7cf7 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -107,38 +107,24 @@ p.notes { margin-right: 1%; } -@media (width: 1200px) { - #body { +/* @media (width: 1200px) { */ +@media print { + /* #body { min-width: 1200px; - } - /* CSS styling to avoid page breaks. */ - .break-avoid { - page-break-inside: avoid; - } - #results-div { - min-height: 875px; - } - .first_page { - height: 507px; - } - .second_page { - height: 560px; - } - .third_page { - height: 120px; - } - .fourth_page { - height: 867px; - } - .collapse { - display: block!important; - } + } */ #results, #rules, #data { display: contents!important; - break-inside: avoid; - page-break-inside: avoid; + } + #link_reproduce_results { + display: none!important; + } + #pdf-qr-code { + visibility: inherit!important; + } + .collapse { + display: block!important; } .tab-content { border-top: none!important; @@ -155,11 +141,15 @@ p.notes { .print-button { display: none!important; } - #link_reproduce_results { - display: none!important; + .card { + page-break-inside: avoid; } - #pdf-qr-code { - visibility: inherit!important; + /* CSS styling to avoid page breaks. */ + .break-after { + page-break-after: always; + } + .break-avoid { + page-break-inside: avoid; } } diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 1b1f4f8e..105b1118 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -23,7 +23,8 @@
Created {{ creation_date }} using CARA calculator version v{{ form.calculator_version }}
- + + {# To be replaced by "Generate PDF" #}Simulation Name: {{ form.simulation_name }}
@@ -371,8 +370,8 @@