pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into remotes/origin/feature/website

Browse source
This commit is contained in:
Luis Aleixo 2021-10-26 10:00:26 +02:00
commit f9c3c111c5
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cara/apps/calculator/static/css/report.css
View file

@ -136,11 +136,9 @@ p.notes {
.card {
page-break-inside: avoid;
}
/* CSS styling to avoid page breaks. */
.break-after {
page-break-after: always;
}
.break-avoid {
#disclaimer {
border: 2px solid black;
padding: 15px;
page-break-inside: avoid;
}
}
@ -154,7 +152,8 @@ p.notes {
position: relative;
text-align: center;
border-radius: 100px;
z-index: 1
z-index: 1;
-webkit-print-color-adjust: exact!important;
}
.intro-banner-vdo-play-btn i {

1
cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
View file

@ -147,7 +147,6 @@
</div>
</div>
</div>
<div class="break-avoid fourth_page"></div>
{% endblock report_preamble %}
{% block report_footer %}

1
cara/apps/templates/about.html.j2
View file

@ -41,7 +41,6 @@ Although the user is able to calculate the infection probability of a stand-alon
<li>Adapt the maximum occupancy considering the effect of HEPA filters</li>
<li>Etc…</li>
</ul>
<h1>Main Developers:</h1><br>
{{ text_blocks['Main Developers'] }}

6
cara/apps/templates/common_text.md.j2
View file

@ -1,6 +1,6 @@
## Main Developers
<h4>Andre Henriques<sup>1</sup>, Marco Andreini<sup>1</sup>, Gabriella Azzopardi<sup>2</sup>, James Devine<sup>3</sup>, Philip Elson<sup>4</sup>, Nicolas Mounet<sup>2</sup>, Markus Kongstein Rognlien<sup>2,6</sup>, Nicola Tarocco<sup>5</sup></h4><br>
<h4>Andre Henriques<sup>1</sup>, Luis Aleixo<sup>1</sup>, Marco Andreini<sup>1</sup>, Gabriella Azzopardi<sup>2</sup>, James Devine<sup>3</sup>, Philip Elson<sup>4</sup>, Nicolas Mounet<sup>2</sup>, Markus Kongstein Rognlien<sup>2,6</sup>, Nicola Tarocco<sup>5</sup></h4><br>
<sup>1</sup>HSE Unit, Occupational Health & Safety Group, CERN<br>
<sup>2</sup>Beams Department, Accelerators and Beam Physics Group, CERN<br>
@ -11,9 +11,9 @@
## Code Contributors
<h5>Anna Efimova<sup>1</sup>, Anel Massalimova<sup>1</sup>, Cole Austin Coughlin<sup>1</sup></h5><br>
<h4>Anna Efimova<sup>1</sup>, Anel Massalimova<sup>1</sup>, Cole Austin Coughlin<sup>1</sup></h4>
<sup>1</sup>Summer Students programme, 2021, CERN<br>
<sup>1</sup>Summer Students, CERN<br>
## Acknowledgements