diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 7b92f54a..0b871e68 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -21,9 +21,11 @@ v{{ calculator_version }} Please send feedback to CARA-dev@cern.ch
-
- -

CARA - COVID Airborne Risk Assessment Calculator

+
+
+

Calculator

+ +
diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index b753c20c..a6ae3556 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -23,18 +23,6 @@ body { /*============= TOP BAR HEADER =============*/ -.top-bar{ - background: rgb(34, 34, 34); - height: 2.8rem; - padding: 0.5rem 0; -} - -.top-bar a { - color: rgb(153, 153, 153); - text-decoration: none; - font-size: 1.1rem; -} - .dropwown-navbar-colors { background: rgb(42, 52, 66); border-color: rgb(42, 52, 66); @@ -87,11 +75,16 @@ body { /*============= TEXT AND CONTENT =============*/ +.header-height { + height: 96px; +} + .logo { - display: block; - margin-left: auto; - margin-right: auto; - height: 4em; + height: 6em; +} + +.logo_form { + height: 3em; } #nat_vent_image { @@ -233,11 +226,6 @@ footer img { width: 25%; } - .logo { - float: left; - height: 6em; - } - #nat_vent_image { height: 15em; } diff --git a/cara/apps/static/images/cara_full_logo.png b/cara/apps/static/images/cara_full_logo.png new file mode 100644 index 00000000..ba18d88a Binary files /dev/null and b/cara/apps/static/images/cara_full_logo.png differ diff --git a/cara/apps/templates/index.html.j2 b/cara/apps/templates/index.html.j2 index 921cb234..92765603 100644 --- a/cara/apps/templates/index.html.j2 +++ b/cara/apps/templates/index.html.j2 @@ -4,9 +4,8 @@ {% block main %} {#
#}
-
- -

CARA - COVID Airborne Risk Assessment

+
+