Merge pull request #1160 from ScilifelabDataCentre/fix-logo

DC Branding

CHANGELOG.md

@@ -86,3 +86,4 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe
 
 - Renamed `api/units.py` to `api/superadmin_only.py` to reflect that it's only Super Admin accessible resources ([#1159](https://github.com/ScilifelabDataCentre/dds_web/pull/1159))
 - Add unit tests for the "set_available_to_expired" and "set_expired_to_archived" functions ([#1158](https://github.com/ScilifelabDataCentre/dds_web/pull/1158))
+- DC Branding: SciLifeLab logo + "Data Delivery System" in nav bar & DC branding in footer ([#1160](https://github.com/ScilifelabDataCentre/dds_web/pull/1160))

dds_web/templates/base.html

@@ -60,8 +60,8 @@
                         <p class="mb-2">DDS is operated by the <a href="https://scilifelab.se/data" target="_blank" class="text-muted">SciLifeLab Data Centre</a>.</p>
                         <p class="mb-0">
                             <a href="https://scilifelab.se/data" target="_blank">
-                                <img src="{{ url_for('static', filename='img/sll_logo_light_bg.svg') }}" title="SciLifeLab Data Centre" style="height: 2rem;" class="hide-dark align-text-top me-3">
-                                <img src="{{ url_for('static', filename='img/sll_logo_dark_bg.svg') }}" title="SciLifeLab Data Centre" style="height: 2rem;" class="hide-light align-text-top me-3">
+                                <img src="{{ url_for('static', filename='img/dc_branding_light_bg.png') }}" title="SciLifeLab Data Centre" style="height: 4rem;" class="hide-dark align-text-top me-3">
+                                <img src="{{ url_for('static', filename='img/dc_branding_dark_bg.png') }}" title="SciLifeLab Data Centre" style="height: 4rem;" class="hide-light align-text-top me-3">
                             </a>
                         </p>
                     </div>

dds_web/templates/components/login_form.html

@@ -1,5 +1,5 @@
 <div style="display: flex; flex-direction: column; justify-content: center;">
-    <h1 style="text-align: center;">Log In</h1>
+    <h1 style="text-align: center; font-size: x-large;">Log In</h1>
 </div>
 <form method="POST" action="{{ url_for('auth_blueprint.login', next=next) }}" class="mt-2">
     {{ form.csrf_token }}    

dds_web/templates/components/navbar.html

@@ -2,8 +2,9 @@
     <div class="container">
         <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start p-2">
             <a href="{{ url_for('pages.home') }}" class="navbar-brand fs-4 d-flex my-2 my-lg-0 me-lg-auto link-body">
-                <img src="{{ url_for('static', filename='img/dds_logo_light_bg.svg') }}" title="SciLifeLab" style="height: 4rem;" class="hide-dark align-text-top me-3">
-                <img src="{{ url_for('static', filename='img/dds_logo_dark_bg.svg') }}" title="SciLifeLab" style="height: 4rem;" class="hide-light align-text-top me-3">
+                <img src="{{ url_for('static', filename='img/scilifelab_logo.svg') }}" title="SciLifeLab" style="height: 2rem;" class="hide-dark align-text-top me-4">
+                <img src="{{ url_for('static', filename='img/scilifelab_logo_darkbg.svg') }}" title="SciLifeLab" style="height: 2rem;" class="hide-light align-text-top me-4">
+                <span class="fw-normal">Data Delivery System</span>
             </a>
             <ul class="nav col-12 col-lg-auto my-2 my-md-0 justify-content-center text-center">
                 <li class="nav-item">