diff --git a/branding/assets/styles/imports/_branding.scss b/branding/assets/styles/imports/_branding.scss new file mode 100644 index 000000000..5f6607013 --- /dev/null +++ b/branding/assets/styles/imports/_branding.scss @@ -0,0 +1,28 @@ +/* + * + * Here, all SCSS variables and classes can be adapted to your custom design. + * +*/ + +$color-primary: #6e8b87; +$color-primary-light: #a6ff00; + +$color-header-background: $color-primary; +$color-footer-background: $color-primary-light; + +$color-locale-menu: $color-primary-light; + +.main-navigation a { + color: $color-primary-light; +} +.main-navigation a:hover { + color: $color-neutral-100; +} + +.main-navigation .locale-menu { + color: $color-primary-light; +} + +.main-navigation .base-button { + color: $color-primary-light; +} \ No newline at end of file diff --git a/branding/constants/emails.js b/branding/constants/emails.js index f5bd9a4a6..d64a9e772 100644 --- a/branding/constants/emails.js +++ b/branding/constants/emails.js @@ -1,8 +1,8 @@ // this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - SUPPORT_EMAIL: 'hello@ocelot.social', - MODERATION_EMAIL: 'hello@ocelot.social', + SUPPORT_EMAIL: 'support@yunite.org', + MODERATION_EMAIL: 'hello@yunite.org', // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails! - ORGANIZATION_LINK: 'https://ocelot.social', - SUPPORT_LINK: 'https://ocelot.social', + ORGANIZATION_LINK: 'https://yunite.org', + SUPPORT_LINK: 'https://yunite.org', } diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index 33cba8d5c..c95e79122 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,12 +1,12 @@ export default { MENU: [ - // { - // name: 'Beiträge', - // path: '/#', - // }, - // { - // name: 'Über Yunite', - // url: 'https://yunite.org', - // }, + { + name: 'Beiträge', + path: '/#', + }, + { + name: 'Über Yunite', + url: 'https://yunite.org', + }, ], } diff --git a/branding/constants/links.js b/branding/constants/links.js index 9cbc605c0..4d27e9669 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -3,7 +3,7 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ - externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.made', // localized string identifier, if undefined default is used @@ -12,12 +12,12 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) 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://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.donate', // localized string identifier, if undefined default is used @@ -26,12 +26,12 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) 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://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used @@ -40,7 +40,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({ @@ -53,11 +53,11 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ - // externalLink: null, // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/ueber-yunite/unsere-werte/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used @@ -66,11 +66,11 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ - // externalLink: null, // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used @@ -79,11 +79,11 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) const FAQ = defaultPageParamsPages.FAQ.overwrite({ - // externalLink: null, // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/ueber-yunite/faq-hilfe/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.faq', // localized string identifier, if undefined default is used @@ -92,11 +92,11 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ - externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating + // externalLink: '', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.support', // localized string identifier, if undefined default is used @@ -105,7 +105,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'branding/locales/html/' + // in case internal page content is here 'webapp/locales/html/' }, }) @@ -125,12 +125,12 @@ export default { FOOTER_LINK_LIST: [ ORGANIZATION, - TERMS_AND_CONDITIONS, + // TERMS_AND_CONDITIONS, CODE_OF_CONDUCT, DATA_PRIVACY, FAQ, - DONATE, + // DONATE, + // SUPPORT, IMPRINT, - SUPPORT, ], -} +} \ No newline at end of file diff --git a/branding/constants/logos.js b/branding/constants/logos.js index 2bea199da..75ac91b30 100644 --- a/branding/constants/logos.js +++ b/branding/constants/logos.js @@ -2,7 +2,7 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', - LOGO_HEADER_WIDTH: '130px', + LOGO_HEADER_WIDTH: '47px', 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/branding/constants/metadata.js b/branding/constants/metadata.js index 3d09066d5..623612dab 100644 --- a/branding/constants/metadata.js +++ b/branding/constants/metadata.js @@ -1,9 +1,9 @@ // this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding export default { - APPLICATION_NAME: 'ocelot.social', - APPLICATION_SHORT_NAME: 'ocelot.social', - APPLICATION_DESCRIPTION: 'Ocelot Social Community', + APPLICATION_NAME: 'yunite.me', + APPLICATION_SHORT_NAME: 'yunite.me', + APPLICATION_DESCRIPTION: 'Yunite Community', COOKIE_NAME: 'ocelot-social-token', - ORGANIZATION_NAME: 'busFaktor e.V.', - ORGANIZATION_JURISDICTION: 'Deutschland', + ORGANIZATION_NAME: 'Verein Corona-Reset', + ORGANIZATION_JURISDICTION: 'Switzerland', } diff --git a/branding/static/favicon.ico b/branding/static/favicon.ico index 430cef437..0f8dc3ea6 100644 Binary files a/branding/static/favicon.ico and b/branding/static/favicon.ico differ diff --git a/branding/static/icon.png b/branding/static/icon.png index 1c81fa5fc..8a3da6f60 100644 Binary files a/branding/static/icon.png and b/branding/static/icon.png differ diff --git a/branding/static/img/custom/logo-horizontal.svg b/branding/static/img/custom/logo-horizontal.svg index d821c8329..e85e839c0 100644 --- a/branding/static/img/custom/logo-horizontal.svg +++ b/branding/static/img/custom/logo-horizontal.svg @@ -1,80 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branding/static/img/custom/logo-squared.svg b/branding/static/img/custom/logo-squared.svg index 15f420c79..6c12acd28 100644 --- a/branding/static/img/custom/logo-squared.svg +++ b/branding/static/img/custom/logo-squared.svg @@ -1,82 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +