From 6656da768b3f44714c28e3bdc81f2054729463df Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 15 Jul 2021 10:08:40 +0200
Subject: [PATCH] Printable version image dimensions fix

---
 cara/apps/calculator/static/css/report.css             |  6 ------
 .../templates/base/calculator.report.html.j2           |  2 +-
 .../themes/cern/templates/calculator.report.html.j2    | 10 +++++-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css
index 2d4951f2..ce2e3790 100644
--- a/cara/apps/calculator/static/css/report.css
+++ b/cara/apps/calculator/static/css/report.css
@@ -81,12 +81,6 @@ p.notes {
 	margin-left: 5%
 }
 
-/* Flexbox layouts */
-.flex {
-	display: flex;
-}
-
-
 .nav-tabs .nav-item .nav-link.active {
 	background-color: #F5F5F6;
 }
\ No newline at end of file
diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2
index 90c0472e..d48b85d2 100644
--- a/cara/apps/calculator/templates/base/calculator.report.html.j2
+++ b/cara/apps/calculator/templates/base/calculator.report.html.j2
@@ -15,7 +15,7 @@
 {% block report_header %}
 
 	<div class="d-flex flex-row">
-		<img src="/static/images/cara_logo.200x200.png" style="height:10em; display:inline-block; vertical-align:middle; padding: 1em;">
+		<img src="/static/images/cara_logo.200x200.png" style="height:150px; display:inline-block; vertical-align:middle; margin: 1%">
 		<div class="d-flex align-self-center flex-column" style="margin-left: 1em">
 			<h2 class="text-component-title" style="margin-bottom: 0">CARA - CALCULATOR REPORT</h1>
 			<p style="margin-bottom: 0"> Created {{ creation_date }} using CARA calculator version v{{ form.calculator_version }}</p>
diff --git a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
index 4a5689d3..cd5fbcda 100644
--- a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
+++ b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
@@ -27,25 +27,25 @@
 {{ super() }}
 
 {% if (prob_inf > 5) %}
-	<div class="flex" style="width:60%; align-self:center">
+	<div class="d-flex" style="align-self:center">
   {% if scale_warning.level == "Green - 1" %}  
     <img class="warning_image_png" src="{{ calculator_prefix }}/static/images/warning_scale/Level1.png">
-    <div class="alert alert-dark warning_text" role="alert">
+    <div class="alert alert-dark warning_text" role="alert" style="width: 50%">
       Note: the current CERN COVID Scale is <b>Green - 1</b>, which means the incidence rate in the local community is <b>{{scale_warning.incidence_rate}}</b>. Align your risk assessment with the guidance and instructions provided by the HSE Unit.  
     </div>
   {% elif scale_warning.level == "Yellow - 2" %}
     <img class="warning_image_png" src="{{ calculator_prefix }}/static/images/warning_scale/Level2.png">
-    <div class="alert alert-dark warning_text" role="alert">
+    <div class="alert alert-dark warning_text" role="alert" style="width: 50%">
       Note: the current CERN COVID Scale is <b>Yellow - 2</b>, which means the incidence rate in the local community is <b>{{scale_warning.incidence_rate}}</b>. There is a reduced chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {{scale_warning.onsite_access}}. See with your supervisor if this scenario is acceptable.
     </div>
   {% elif scale_warning.level == "Orange - 3" %}
     <img class="warning_image_png" src="{{ calculator_prefix }}/static/images/warning_scale/Level3.png">
-    <div class="alert alert-dark warning_text" role="alert">
+    <div class="alert alert-dark warning_text" role="alert" style="width: 50%">
       Warning: the current CERN COVID Scale is <b>Orange - 3</b>, which means the incidence rate in the local community is <b>{{scale_warning.incidence_rate}}</b>. There is a slight chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {{scale_warning.onsite_access}}. See with your supervisor if any additional measures can be applied (ALARA).
     </div>
   {% elif scale_warning.level == "Red - 4" %}
     <img class="warning_image_png" src="{{ calculator_prefix }}/static/images/warning_scale/Level4.png">
-    <div class="alert alert-dark warning_text" role="alert">
+    <div class="alert alert-dark warning_text" role="alert" style="width: 50%">
       Warning: the current CERN COVID Scale is <b>Red - 4</b>, which means the incidence rate in the local community is <b>{{scale_warning.incidence_rate}}</b>. There is a strong chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {{scale_warning.onsite_access}}. Please reduce the value below the threshold of <b>{{scale_warning.threshold}}</b>.
     </div>
   {% else %}