From 5f5c0faa1f28cd4df7681eba335ae5998b2d9cca Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Sep 2022 17:52:03 +0200 Subject: [PATCH] cleanup refactor rebranding --- webapp/components/Logo/Logo.vue | 6 +- webapp/components/Logo/style.scss | 6 -- webapp/constants/headerMenu.js | 29 +------- webapp/constants/links.js | 18 ++--- webapp/constants/logos.js | 1 + webapp/layouts/default.vue | 10 +-- webapp/static/img/custom/logo-horizontal.svg | 64 +++++++++++++++--- webapp/static/img/custom/logo-squared.svg | 70 +++++++++++++++++--- 8 files changed, 139 insertions(+), 65 deletions(-) diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index 6e4dd3cbc3..748af46a83 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -59,7 +59,7 @@ export default { }, data() { const logosObject = { - header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: '47px' }, + header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: logos.LOGO_HEADER_WIDTH }, welcome: { path: logos.LOGO_WELCOME_PATH, alt: 'Welcome', widthDefault: '200px' }, signup: { path: logos.LOGO_SIGNUP_PATH, alt: 'Sign Up', widthDefault: '200px' }, logout: { path: logos.LOGO_LOGOUT_PATH, alt: 'Logging Out', widthDefault: '200px' }, @@ -90,6 +90,9 @@ export default { return `width: ${width};` }, }, + created() { + console.log('logoWidth', this.logoWidth) + }, } @@ -107,7 +110,6 @@ export default { } .ds-logo-svg { - width: 47px; height: auto; fill: #000000; } diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss index aa153c8f67..69897422fe 100644 --- a/webapp/components/Logo/style.scss +++ b/webapp/components/Logo/style.scss @@ -8,10 +8,4 @@ .ds-logo-inverse { color: $text-color-primary-inverse; -} - -.ds-logo-svg { - width: 47px; - height: auto; - fill: currentColor; } \ No newline at end of file diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 0455290d1b..7055c44e52 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,36 +1,13 @@ export default { - SHOW_HEADER_MENU: true, MENU: [ - { - name: 'Beiträge', - path: '/#', - }, // { - // name: 'Themen', - // path: '/#', - // }, - // { - // name: 'Gruppen', + // name: 'Beiträge', // path: '/#', // }, - { - name: 'Über Yunite', - path: '/#', - url: 'https://yunite.org', - // children: [ - // { - // name: 'Impressum', - // path: '/#', - // }, - // { - // name: 'Yunite Team', - // path: '/#', - // }, - // ], - }, // { - // name: 'Topic', + // name: 'Über Yunite', // path: '/#', + // url: 'https://yunite.org', // }, ], } diff --git a/webapp/constants/links.js b/webapp/constants/links.js index 09dba8629c..c65c9be3c9 100644 --- a/webapp/constants/links.js +++ b/webapp/constants/links.js @@ -3,7 +3,7 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ - externalLink: 'https://yunite.org', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.made', // localized string identifier, if undefined default is used @@ -17,7 +17,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.donate', // localized string identifier, if undefined default is used @@ -31,7 +31,7 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ }) const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating + externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used @@ -57,7 +57,7 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri }, }) const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ - externalLink: 'https://yunite.org/ueber-yunite/unsere-werte/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used @@ -70,7 +70,7 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ }, }) const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ - externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used @@ -83,7 +83,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ }, }) const FAQ = defaultPageParamsPages.FAQ.overwrite({ - externalLink: 'https://yunite.org/ueber-yunite/faq-hilfe/', // if string is defined and not empty it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.faq', // localized string identifier, if undefined default is used @@ -125,12 +125,12 @@ export default { FOOTER_LINK_LIST: [ ORGANIZATION, - // TERMS_AND_CONDITIONS, + TERMS_AND_CONDITIONS, CODE_OF_CONDUCT, DATA_PRIVACY, FAQ, - // DONATE, - // SUPPORT, + DONATE, + SUPPORT, IMPRINT, ], } diff --git a/webapp/constants/logos.js b/webapp/constants/logos.js index d093c7b467..2bea199dab 100644 --- a/webapp/constants/logos.js +++ b/webapp/constants/logos.js @@ -2,6 +2,7 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_WIDTH: '130px', LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index b41770926b..3e2a4aa693 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -4,7 +4,7 @@
- + @@ -47,8 +47,8 @@ :width="{ base: '45%', sm: '45%', - md: show ? 'auto' : '45%', - lg: show ? 'auto' : '50%', + md: isHeaderMenu ? 'auto' : '45%', + lg: isHeaderMenu ? 'auto' : '50%', }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }" style="flex-shrink: 0; flex-grow: 1" @@ -113,6 +113,7 @@