diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 1009b72c..e4a3221c 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 { @@ -96,6 +101,7 @@ body { .cara_home_image { height: 18rem; padding: 1rem; + margin-bottom: 1rem; border-radius: 1.25rem!important; } @@ -154,6 +160,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 { @@ -238,6 +256,17 @@ footer img { .cara_home_image { float: right; } + + .navbar .nav-item .dropdown-menu{ display: none; } + + .navbar .nav-item:hover .dropdown-menu{ display: block; } + + .navbar .nav-item .dropdown-menu{ margin-top:0; } + + #apps_section { + display: inline!important; + } + } @media (max-width: 40em) { 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 aee3046e..78b6fc15 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -31,6 +31,19 @@ +
+ +
+
+

Apps:

+
+ +
+
Expert (beta)
+
+
+
+

CARA @ CERN


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

-

Acknowledgements


@@ -48,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 %} diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2 index 0183a7fd..c4abbcc7 100644 --- a/cara/apps/templates/layout.html.j2 +++ b/cara/apps/templates/layout.html.j2 @@ -37,8 +37,16 @@