From 34ab697284e9a4cc76bd6f3fb3cd81331a36928b Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 15 Oct 2021 15:32:44 +0200 Subject: [PATCH 1/6] guide and calculator as dropwdown list fixes #203 --- .../calculator/templates/calculator.form.html.j2 | 4 ---- cara/apps/static/css/style.css | 12 ++++++++++++ cara/apps/templates/layout.html.j2 | 14 +++++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 6626dd25..16a34522 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -436,10 +436,6 @@ v{{ calculator_version }} Please sen
- -    diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 2b8bb197..e25f90ad 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -35,6 +35,11 @@ body { font-size: 1.1rem; } +.dropwown-navbar-colors { + background: rgb(42, 52, 66); + border-color: rgb(42, 52, 66); +} + /*============= NAVIGATION =============*/ .navbar-brand img { @@ -195,6 +200,13 @@ footer img { .logo { float: left; } + + .navbar .nav-item .dropdown-menu{ display: none; } + + .navbar .nav-item:hover .dropdown-menu{ display: block; } + + .navbar .nav-item .dropdown-menu{ margin-top:0; } + } /* Devices under 768px (md) */ /* @media (max-width: 767.98px) { diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 131c5497..887ffdee 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -37,10 +37,18 @@
From 342be899b964d5e5f715f2ea77d1fb51d3dd8d78 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 18 Oct 2021 10:25:17 +0200 Subject: [PATCH 2/6] Dropdown list items update --- cara/apps/templates/layout.html.j2 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 887ffdee..d05e3fb8 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -38,16 +38,17 @@ From e66ebfc7459a7887ddb19a5559296aaae445fd93 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 25 Oct 2021 11:39:51 +0200 Subject: [PATCH 3/6] Updated nav-items padding for mobile screens --- cara/apps/templates/layout.html.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index d05e3fb8..3ceeb6db 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -37,8 +37,8 @@ From a4090dae7095c2d1b82c2d975112130ce102cde8 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 3 Nov 2021 14:39:39 +0100 Subject: [PATCH 5/6] Added buttons on landing page to go directly to calculator or expert apps --- cara/apps/static/css/style.css | 16 +++++++++ cara/apps/static/icons/calculator.svg | 51 +++++++++++++++++++++++++++ cara/apps/static/icons/expert.svg | 14 ++++++++ cara/apps/templates/index.html.j2 | 13 ++++++- 4 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 cara/apps/static/icons/calculator.svg create mode 100644 cara/apps/static/icons/expert.svg diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index e25f90ad..248300b8 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -152,6 +152,18 @@ body { color: black; } +.icon-calculator { + background: url(../icons/calculator.svg); + width: 30px; + display: block; +} + +.icon-expert { + background: url(../icons/expert.svg); + width: 30px; + display: block; +} + /*===== FIXED BACKGROUND IMG =====*/ .fixed-background { @@ -207,6 +219,10 @@ footer img { .navbar .nav-item .dropdown-menu{ margin-top:0; } + #apps_section { + display: inline!important; + } + } /* Devices under 768px (md) */ /* @media (max-width: 767.98px) { diff --git a/cara/apps/static/icons/calculator.svg b/cara/apps/static/icons/calculator.svg new file mode 100644 index 00000000..2d6a6e0c --- /dev/null +++ b/cara/apps/static/icons/calculator.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cara/apps/static/icons/expert.svg b/cara/apps/static/icons/expert.svg new file mode 100644 index 00000000..ce82a549 --- /dev/null +++ b/cara/apps/static/icons/expert.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index e93898e7..7517df9b 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -23,8 +23,19 @@ It includes detailed instructions on how to run your own version of this tool.

-
+ +
+
+

Apps:

+
+
Calculator
+
+ +
+
+
+

CARA @ CERN


From 9203423df6ecc8761dbcb3713984d2dc84df0bbf Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 3 Nov 2021 15:09:06 +0100 Subject: [PATCH 6/6] Bug on mobile version --- cara/apps/static/css/style.css | 1 + cara/apps/templates/index.html.j2 | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 773f006a..e4a3221c 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -101,6 +101,7 @@ body { .cara_home_image { height: 18rem; padding: 1rem; + margin-bottom: 1rem; border-radius: 1.25rem!important; } diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index 0da1e14e..78b6fc15 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -44,14 +44,6 @@

-

CARA @ CERN


-
-

- CARA has been developed by CERN with the intention of allowing members of personnel with roles related to supervision, health & safety or space management to simulate the concerned workplaces on CERN sites. - A hosted CERN version of the CARA Covid Calculator is available on this site to members of the CERN personnel. -

-
-

CARA @ CERN


@@ -59,7 +51,6 @@ A hosted CERN version of the CARA Covid Calculator is available on this site to members of the CERN personnel.

-

Acknowledgements


@@ -69,5 +60,6 @@ Our compliments towards the work and research performed by world leading scientists in this domain: Prof. Manuel Gameiro, Prof. Shelly Miller, Prof. Linsey Marr, Prof. Jose Jimenez, Dr. Lidia Morawska, Prof Yuguo Li et al. – their scientific contribution was indispensable for this project.

+ {% endblock main %}