diff --git a/webapp/assets/fonts/Overpass-VariableFont_wght.ttf b/webapp/assets/fonts/Overpass-VariableFont_wght.ttf deleted file mode 100644 index 1cf730a5a..000000000 Binary files a/webapp/assets/fonts/Overpass-VariableFont_wght.ttf and /dev/null differ diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index ea6edd9e4..75058595d 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -2,122 +2,4 @@ * * Here, all SCSS variables and classes can be adapted to your custom design. * -*/ - -@font-face { - font-family: Overpass; - src: url('~@/assets/fonts/Overpass-VariableFont_wght.ttf'); -} - -$color-primary: rgb(110, 139, 135); -$color-primary-light: rgb(161, 179, 177); -$color-primary-dark: rgb(81, 99, 97); -$color-primary-active: rgb(123, 160, 149); -$color-primary-inverse: rgb(241, 248, 243); - -$color-secondary: rgb(166, 255, 0); -$color-secondary-active: rgb(188, 255, 130); -$color-secondary-inverse: rgb(241, 255, 225); - -$font-family-heading: 'Overpass',Helvetica,Arial,Lucida,sans-serif; -$font-family-text: 'Overpass',Helvetica,Arial,Lucida,sans-serif; - -$color-header-background: $color-primary; -$color-footer-background: $color-secondary; - -$color-locale-menu: $color-secondary; - -$color-donation-bar: $color-secondary; - -$color-toast-blue: rgb(0, 142, 230); -$color-toast-green: $color-primary; - - -.main-navigation a { - color: #fff; - text-transform: uppercase; - font-size: 16px; - font-weight: 500; -} -.main-navigation a:hover { - color: hsla(0,0%,100%,.8); -} -.main-navigation .router-link-exact-active { - color: #A6FF00!important; -} - -.main-navigation .locale-menu { - color: #fff; -} - -.main-navigation .base-button { - color: #fff; -} - -#nav-search-box .hc-hashtag a{ - color: #17b53f; -} - -#footer { - background-color: $color-secondary; -} - -#footer a { - color: $color-primary; -} - -.avatar-menu .profile-avatar { - color: $color-primary; -} - -.profile-avatar .initials { - color: $color-primary; -} - -.branding-menu .ds-text { - font-family: 'Overpass',Helvetica,Arial,Lucida,sans-serif; - font-weight: 500; - text-transform: uppercase; - font-size: 16px; -} - -/* avoid uppercase for user slug */ -span.slug { - text-transform: none; -} - -.ds-footer { - font-family: 'Overpass',Helvetica,Arial,Lucida,sans-serif; - text-transform: uppercase; - font-size: 16px; - font-weight: 300; -} - -/* chips on group teaser */ -a.group-teaser footer .ds-chip-primary { - background-color: $color-primary; -} -/* chips on group profile */ -.group-profile .ds-chip-primary { - background-color: $color-primary; -} - -/* number count color */ -div.ds-number > p.ds-number-count { - color: $color-primary; -} - -/* active tab border bottom color */ -div.tab-navigation li.Tabs__tab { - border-bottom-color: $color-primary; -} - -/* submit button color group form */ -form.group-form button.ds-button-primary { - background-color: $color-primary; -} - -/* color of active filter tags in post teaser */ -span.category-tag.filterActive { - background-color: $color-primary; -} +*/ \ No newline at end of file diff --git a/webapp/constants/donation.js b/webapp/constants/donation.js index 12582bcef..3e36ae9a8 100644 --- a/webapp/constants/donation.js +++ b/webapp/constants/donation.js @@ -1 +1 @@ -export const PROGRESS_BAR_COLOR_TYPE = 'uni' // 'gradient' is the other option +export const PROGRESS_BAR_COLOR_TYPE = 'gradient' // 'uni' is the other option diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js index d64a9e772..34daaecb0 100644 --- a/webapp/constants/emails.js +++ b/webapp/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: 'support@yunite.org', - MODERATION_EMAIL: 'hello@yunite.org', + SUPPORT_EMAIL: 'devops@ocelot.social', + MODERATION_EMAIL: 'devops@ocelot.social', // 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://yunite.org', - SUPPORT_LINK: 'https://yunite.org', + ORGANIZATION_LINK: 'https://ocelot.social', + SUPPORT_LINK: 'https://ocelot.social', } diff --git a/webapp/constants/groups.js b/webapp/constants/groups.js index f54a3bc08..a634425a4 100644 --- a/webapp/constants/groups.js +++ b/webapp/constants/groups.js @@ -1,5 +1,5 @@ // this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js` export const NAME_LENGTH_MIN = 3 export const NAME_LENGTH_MAX = 50 -export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags -export const SHOW_GROUP_BUTTON_IN_HEADER = false +export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 50 // with removed HTML tags +export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 7bd827e54..aa87a598c 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,22 +1,13 @@ export default { MENU: [ - { - nameIdent: 'yuniteRebranding.header.newsFeed', - path: '/', - }, - { - nameIdent: 'yuniteRebranding.header.groups', - path: '/groups', - }, - { - nameIdent: 'yuniteRebranding.header.topics', - url: 'https://yunite.org/themen/', - target: '', - }, - { - nameIdent: 'yuniteRebranding.header.about', - url: 'https://yunite.org', - target: '', - }, + // { + // nameIdent: 'nameIdent', + // path: '/', + // }, + // { + // nameIdent: 'nameIdent', + // url: 'https://ocelot.social', + // target: '_blank', + // }, ], } diff --git a/webapp/constants/links.js b/webapp/constants/links.js index 9bf27a86f..3af64d374 100644 --- a/webapp/constants/links.js +++ b/webapp/constants/links.js @@ -5,8 +5,8 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ // if defined it's dominating externalLink: { - url: 'https://yunite.org', - target: '', + url: 'https://ocelot.social', + target: '_blank', }, internalPage: { @@ -22,8 +22,9 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ const DONATE = defaultPageParamsPages.DONATE.overwrite({ // if defined it's dominating externalLink: { - url: 'https://yunite.org/spenden/', - target: '', + // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly + url: 'https://ocelot-social.herokuapp.com/donations', + target: '_blank', }, internalPage: { @@ -33,24 +34,24 @@ 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({ - // if defined it's dominating externalLink: { - url: 'https://yunite.org/impressum/', - target: '', + // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly + url: 'https://ocelot-social.herokuapp.com/imprint', + target: '_blank', }, internalPage: { - footerIdent: 'yuniteRebranding.footer.imprint', // localized string identifier, if undefined default is used + // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used 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({ @@ -63,15 +64,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({ - // if defined it's dominating - externalLink: { - url: 'https://yunite.org/ueber-yunite/unsere-werte/', - target: '', - }, + // externalLink: null, // if defined it's dominating internalPage: { // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used @@ -80,32 +77,24 @@ 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({ - // if defined it's dominating - externalLink: { - url: 'https://yunite.org/datenschutz/', - target: '', - }, + // externalLink: null, // if defined it's dominating internalPage: { - footerIdent: 'yuniteRebranding.footer.dataPrivacy', // localized string identifier, if undefined default is used + // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used 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({ - // if defined it's dominating - externalLink: { - url: 'https://yunite.org/ueber-yunite/faq-hilfe/', - target: '', - }, + // externalLink: null, // if defined it's dominating internalPage: { // footerIdent: 'site.faq', // localized string identifier, if undefined default is used @@ -114,14 +103,14 @@ 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({ // if defined it's dominating externalLink: { - url: 'https://yunite.org/ueber-yunite/faq-hilfe/', - target: '', + url: 'https://ocelot.social', + target: '_blank', }, internalPage: { @@ -131,7 +120,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/' }, }) @@ -150,13 +139,13 @@ export default { SUPPORT, FOOTER_LINK_LIST: [ - // ORGANIZATION, - // TERMS_AND_CONDITIONS, - // CODE_OF_CONDUCT, + ORGANIZATION, + TERMS_AND_CONDITIONS, + CODE_OF_CONDUCT, DATA_PRIVACY, - // FAQ, - // DONATE, - // SUPPORT, + FAQ, + DONATE, + SUPPORT, IMPRINT, ], } diff --git a/webapp/constants/logos.js b/webapp/constants/logos.js index 45e7831af..714e78a2c 100644 --- a/webapp/constants/logos.js +++ b/webapp/constants/logos.js @@ -2,13 +2,19 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', - LOGO_HEADER_WIDTH: '47px', + LOGO_HEADER_WIDTH: '130px', LOGO_HEADER_CLICK: { - externalLink: { - url: 'https://yunite.org', - target: '', + // externalLink: { + // url: 'https://ocelot.social', + // target: '_blank', + // }, + externalLink: null, + internalPath: { + to: { + name: 'index', + }, + scrollTo: '.main-navigation', }, - internalPath: null, }, LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js index 62162bd94..da313c7fb 100644 --- a/webapp/constants/metadata.js +++ b/webapp/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: 'yunite.me', - APPLICATION_SHORT_NAME: 'yunite.me', - APPLICATION_DESCRIPTION: 'yunite.me – Alternatives Netzwerk für eine freie und bunte Zukunft', - COOKIE_NAME: 'yunite-me-token', - ORGANIZATION_NAME: 'yunite – Verein für Vernetzung und Kooperation', - ORGANIZATION_JURISDICTION: 'Switzerland', + APPLICATION_NAME: 'ocelot.social', + APPLICATION_SHORT_NAME: 'ocelot.social', + APPLICATION_DESCRIPTION: 'ocelot.social Community Network', + COOKIE_NAME: 'ocelot-social-token', + ORGANIZATION_NAME: 'ocelot.social Community', + ORGANIZATION_JURISDICTION: 'City of Angels', } diff --git a/webapp/locales/de.json b/webapp/locales/de.json index a44e36974..3e0e7369d 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -1002,17 +1002,5 @@ "newTermsAndConditions": "Neue Nutzungsbedingungen", "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.", "termsAndConditionsNewConfirmText": "Bitte lies Dir die neuen Nutzungsbedingungen jetzt durch!" - }, - "yuniteRebranding": { - "header": { - "about": "Über Yunite", - "groups": "Gruppen", - "newsFeed": "Beiträge", - "topics": "Themen" - }, - "footer": { - "dataPrivacy": "Datenschutz", - "imprint": "Impressum" - } } } diff --git a/webapp/locales/en.json b/webapp/locales/en.json index d6f122b7a..9e45396b8 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -1002,17 +1002,5 @@ "newTermsAndConditions": "New Terms and Conditions", "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.", "termsAndConditionsNewConfirmText": "Please read the new terms of use now!" - }, - "yuniteRebranding": { - "header": { - "about": "About Yunite", - "groups": "Groups", - "newsFeed": "News Feed", - "topics": "Topics" - }, - "footer": { - "dataPrivacy": "Data privacy", - "imprint": "Imprint" - } } } diff --git a/webapp/static/favicon.ico b/webapp/static/favicon.ico index 0f8dc3ea6..b535a3db8 100644 Binary files a/webapp/static/favicon.ico and b/webapp/static/favicon.ico differ diff --git a/webapp/static/icon.png b/webapp/static/icon.png index 8a3da6f60..eca541332 100644 Binary files a/webapp/static/icon.png and b/webapp/static/icon.png differ diff --git a/webapp/static/img/custom/logo-horizontal.svg b/webapp/static/img/custom/logo-horizontal.svg index e85e839c0..4121fa08e 100644 --- a/webapp/static/img/custom/logo-horizontal.svg +++ b/webapp/static/img/custom/logo-horizontal.svg @@ -1,15 +1,63 @@ - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/logo-squared.svg b/webapp/static/img/custom/logo-squared.svg index 6c12acd28..2a926f0a9 100644 --- a/webapp/static/img/custom/logo-squared.svg +++ b/webapp/static/img/custom/logo-squared.svg @@ -1,15 +1,65 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +