Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DC Branding #1160

Merged
merged 4 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Binary file added dds_web/static/img/dc_branding_dark_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions dds_web/static/img/dc_branding_dark_bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dds_web/static/img/dc_branding_light_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions dds_web/static/img/dc_branding_light_bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions dds_web/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dds_web/templates/components/login_form.html
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions dds_web/templates/components/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down