From 79a96490ed9c75f8115ee3ec64428fef2512c387 Mon Sep 17 00:00:00 2001 From: irismarie Date: Thu, 11 Mar 2021 15:42:17 +0100 Subject: [PATCH] changed the logo --- src/app.js | 2 +- src/branding/brands.js | 78 -------------------------------- src/branding/slew/slew-home.js | 2 +- src/branding/slew/slew-values.js | 3 +- 4 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 src/branding/brands.js diff --git a/src/app.js b/src/app.js index 6f55fdc..57f24ba 100644 --- a/src/app.js +++ b/src/app.js @@ -66,7 +66,7 @@ class App extends React.Component { var link = document.createElement('link'); link.id = 'dynamic-favicon'; link.rel = 'shortcut icon' - link.href = Branding.instance.values.icon; + link.href = '/' + Branding.instance.values.icon; if (oldlink) { document.head.removeChild(oldlink); diff --git a/src/branding/brands.js b/src/branding/brands.js deleted file mode 100644 index 671d068..0000000 --- a/src/branding/brands.js +++ /dev/null @@ -1,78 +0,0 @@ -/** - * This file is part of VILLASweb. - * - * VILLASweb is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * VILLASweb is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with VILLASweb. If not, see . - ******************************************************************************/ - -const brands = { - villasweb: { - title: 'VILLASweb', - subtitle: 'ACS', - logo: 'villas_web.svg', - pages: { - home: true, - scenarios: true, - infrastructure: true, - users: true, - account: true, - api: true, - }, - style: { - bgcolor: '#6EA2B0', - highlights: '#527984', - primarytext: '#4d4d4d', - secondarytext: '#818181', - } - }, - slew: { - title: 'SLEW', - subtitle: 'Second Life for Energiewende', - logo: "slew-logo.png", - icon: "/slew_icon.png", - pages: { - home: true, - scenarios: true, - infrastructure: false, - users: false, - account: false, - api: false - }, - links: { - "DPsim Simulator": "https://dpsim.fein-aachen.org", - "VILLASframework": "https://villas.fein-aachen.org/doc" - }, - style: { - bgcolor: '#900603', - highlights: '#610C04', - primarytext: '#420C09', - secondarytext: '#710C04', - font: "16px Roboto, sans-serif", - } - }, - test: { - title: 'SLEW', - subtitle: 'Second Life for Energiewende', - logo: "slew-logo.png", - pages: { - home: true, - scenarios: true, - infrastructure: false, - users: false, - account: false, - api: false - }, - } -} - -export default brands; \ No newline at end of file diff --git a/src/branding/slew/slew-home.js b/src/branding/slew/slew-home.js index 5f65209..4494e9c 100644 --- a/src/branding/slew/slew-home.js +++ b/src/branding/slew/slew-home.js @@ -22,7 +22,7 @@ export function slew_home(title) { return (
- Logo VILLASweb + Logo VILLASweb

Home

Welcome to {title}! diff --git a/src/branding/slew/slew-values.js b/src/branding/slew/slew-values.js index 70f4582..5d38a8d 100644 --- a/src/branding/slew/slew-values.js +++ b/src/branding/slew/slew-values.js @@ -18,8 +18,7 @@ const slew_values = { title: 'SLEW', subtitle: 'Second Life for Energiewende', - logo: "slew-logo.png", - icon: "/slew_icon.png", + icon: "slew-icon-draft.png", pages: { home: true, scenarios: true,