Merge pull request #282 from DLR-SC/feature/replace-placeholder-logo

Replace the DLR Logo with the LOKI logo and make it smaller
DLR-SC · Jul 13, 2023 · 098dbf0 · 098dbf0
2 parents e15a5f2 + 58f7135
commit 098dbf0
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 6 deletions.
diff --git a/frontend/docs/changelog/changelog-de.md b/frontend/docs/changelog/changelog-de.md
@@ -17,6 +17,7 @@
 - Alle Texte sind nun in Englisch und in Deutsch verfügbar.
 - Es wurden einige Verbesserungen gemacht, die das Laden der Seite beschleunigen.
 - Wenn neue Funktionen zur Verfügung gestellt werden, wird der Browser-Cache nicht mehr verhindern, dass Benutzer:innen diese sehen.
+- Das DLR-Logo wurde durch das LOKI-Logo ersetzt und verkleinert.
 
 ### Fehlerbehebungen
 

diff --git a/frontend/docs/changelog/changelog-en.md b/frontend/docs/changelog/changelog-en.md
@@ -17,6 +17,7 @@
 - All texts are now available in Englisch and German.
 - Some improvements to page load speed have been made.
 - If a new feature gets rolled out, the browser cache will no longer prevent the users from seeing it.
+- The DLR logo was replaced by the LOKI logo and the size was reduced.
 
 ### Bug fixes
 

diff --git a/frontend/public/assets/logo/DLRLogo.png b/frontend/public/assets/logo/DLRLogo.png
diff --git a/frontend/public/assets/logo/DLRSignet.png b/frontend/public/assets/logo/DLRSignet.png
diff --git a/frontend/public/assets/logo/DLR_Logo.png b/frontend/public/assets/logo/DLR_Logo.png
diff --git a/frontend/public/assets/logo/LOKI_compact.svg b/frontend/public/assets/logo/LOKI_compact.svg
diff --git a/frontend/public/locales/de/global.json5 b/frontend/public/locales/de/global.json5
@@ -64,6 +64,6 @@
   germany: 'Deutschland',
   WIP: 'Diese Funktionalität befindet sich noch in der Entwicklung.',
   'no-data': 'Keine Daten',
-  'dlr-logo': 'DLR-Logo',
+  'loki-logo': 'LOKI-Logo',
   okay: 'Okay',
 }
diff --git a/frontend/public/locales/en/global.json5 b/frontend/public/locales/en/global.json5
@@ -72,7 +72,7 @@
   search: 'Search',
   germany: 'Germany',
   'no-data': 'No Data',
-  'dlr-logo': 'DLR logo',
+  'loki-logo': 'LOKI logo',
   lorem: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore\
     et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet\
     clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,\

diff --git a/frontend/src/components/Sidebar/SidebarTabs.tsx b/frontend/src/components/Sidebar/SidebarTabs.tsx
@@ -1,7 +1,7 @@
 import Box from '@mui/material/Box';
 import {useTranslation} from 'react-i18next';
 import React from 'react';
-import dlrLogo from 'assets/logo/DLR_Logo.png';
+import logo from 'assets/logo/LOKI_compact.svg';
 
 export default function SidebarTabs(): JSX.Element {
   const {t} = useTranslation('global');
@@ -23,8 +23,8 @@ export default function SidebarTabs(): JSX.Element {
       }}
     >
       {/* This is a placeholder for now. */}
-      <a href='https://www.dlr.de/' target='_blank' rel='noopener noreferrer' style={{width: '90%'}}>
-        <img src={dlrLogo} alt={t('dlr-logo')} width='100%' />
+      <a href='https://www.dlr.de/' target='_blank' rel='noopener noreferrer' style={{width: '40%'}}>
+        <img src={logo} alt={t('loki-logo')} width='100%' />
       </a>
 
       {/*

diff --git a/frontend/webpack/webpack.common.js b/frontend/webpack/webpack.common.js
@@ -14,7 +14,7 @@ module.exports = {
     new HtmlWebpackInjectPreload({
       files: [
         {
-          match: /(DLR_Logo)+.+(.png)$/,
+          match: /(LOKI_compact)+.+(.svg)$/,
           attributes: {as: 'image'},
         },
         {