diff --git a/app/cara.ipynb b/app/cara.ipynb index dfb6a440..967bcbbc 100644 --- a/app/cara.ipynb +++ b/app/cara.ipynb @@ -5,7 +5,7 @@ "metadata": {}, "source": [ "
\n", - "
\n", + "\n", "

\n", "Airborne Transmission of SARS-CoV-2\n", "

" diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 64731dda..7ecbf366 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -21,7 +21,7 @@ v{{ calculator_version }} Please send feedback to CARA-dev@cern.ch
- +

CARA - COVID Airborne Risk Assessment calculator

diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 491fdde1..148e44fd 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -12,9 +12,9 @@ -
- -

Report

+
+ +

Report

Created {{ creation_date }} using CARA calculator version v{{ form.calculator_version }}


diff --git a/cara/apps/static/css/cern-theme3.css b/cara/apps/static/css/cern-theme3.css index e04e8bab..4a375296 100644 --- a/cara/apps/static/css/cern-theme3.css +++ b/cara/apps/static/css/cern-theme3.css @@ -384,6 +384,10 @@ body header .site-info { display: flex; } +header .site-info__text img { + height: 58pt; +} + body header .site-info__logo { padding: 0 10px 0 0; } @@ -875,6 +879,10 @@ body.has-header.cern-toolbar:not(.toolbar-vertical).toolbar-tray-open main nav.t width: 90%; max-height: 60px; } + + header .site-info__text img { + height: 60px; + } } @media only screen and (max-width:360px) { diff --git a/cara/apps/static/images/cara_logo.200x200.png b/cara/apps/static/images/cara_logo.200x200.png new file mode 100644 index 00000000..12d63798 Binary files /dev/null and b/cara/apps/static/images/cara_logo.200x200.png differ diff --git a/cara/apps/static/images/cara_logo.png b/cara/apps/static/images/cara_logo.png index c8d3e927..8ebce1d1 100755 Binary files a/cara/apps/static/images/cara_logo.png and b/cara/apps/static/images/cara_logo.png differ diff --git a/cara/apps/static/images/cara_logo_text.png b/cara/apps/static/images/cara_logo_text.png index 2e7fb345..f56afe90 100755 Binary files a/cara/apps/static/images/cara_logo_text.png and b/cara/apps/static/images/cara_logo_text.png differ diff --git a/cara/apps/static/images/cara_logo_text_cern.png b/cara/apps/static/images/cara_logo_text_cern.png old mode 100755 new mode 100644 index 5efc1514..022b8bcb Binary files a/cara/apps/static/images/cara_logo_text_cern.png and b/cara/apps/static/images/cara_logo_text_cern.png differ diff --git a/cara/apps/static/images/cara_logo_text_cern_tight_margins.png b/cara/apps/static/images/cara_logo_text_cern_tight_margins.png deleted file mode 100755 index d15b58ae..00000000 Binary files a/cara/apps/static/images/cara_logo_text_cern_tight_margins.png and /dev/null differ diff --git a/cara/apps/static/images/cara_logo_text_tight_margins.png b/cara/apps/static/images/cara_logo_text_tight_margins.png deleted file mode 100755 index e62d1619..00000000 Binary files a/cara/apps/static/images/cara_logo_text_tight_margins.png and /dev/null differ diff --git a/cara/apps/static/images/cara_logo_white_text.png b/cara/apps/static/images/cara_logo_white_text.png index c47b400f..79fcb368 100644 Binary files a/cara/apps/static/images/cara_logo_white_text.png and b/cara/apps/static/images/cara_logo_white_text.png differ diff --git a/cara/apps/static/logo.svg b/cara/apps/static/logo.svg deleted file mode 100644 index 26f99a9c..00000000 --- a/cara/apps/static/logo.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index 2025826b..9713067c 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -12,7 +12,7 @@
- +

CARA: COVID Airborne Risk Assessment Tools

diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 0bc9c4b1..e7658ad2 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -89,15 +89,15 @@
-
+
- home + home
-
+