Skip to content

🧘🏼 [Simulation] Do not Merge!!! – Brand reformer network #8007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 30 commits into
base: master
Choose a base branch
from

Conversation

Tirokk
Copy link
Member

@Tirokk Tirokk commented Oct 25, 2024

Do not Merge!!! – Brand reformer network first step

Just to simulate the Reformer.network branding in the main base code to make development more easy.

Branding repo is here: https://github.com/IT4Change/reformer.network
And actual branding PR is here: IT4Change/reformer.network#2

🍰 Pullrequest

Issues

  • None

Todo

  • X

@Tirokk Tirokk marked this pull request as draft October 25, 2024 10:29
@Tirokk Tirokk self-assigned this Oct 25, 2024
Bettelstab and others added 7 commits October 27, 2024 15:33
…-Social-Community/Ocelot-Social into brand-reformer-network-first-step
…y/Ocelot-Social into brand-reformer-network-first-step

Conflicts:
	webapp/components/HeaderMenu/HeaderMenu.vue
Tirokk and others added 2 commits April 23, 2025 11:02
* Refine locals of some internal pages headlines

* Create page 'legacy information'

* Move filter button into menu

* Refine page 'legacy information'

* Create internal page 'code-of-conduct.html'

* Refine internal page 'code-of-conduct.html'

* Refine page 'legacy information'

* Create internal page 'imprint.html'

* Create internal page 'faq.html'

* Create internal page 'support.html'

* Refine internal page 'faq.html'

* Refine internal page 'imprint.html'

* Move parts of internal page 'data-privacy.html' to 'terms-and-conditions.html'

* Refine internal page 'data-privacy.html'

* Fix tool tip text

* Fix 'email' -> 'e-mail'

* Rename title of organization footer item

- Remove donation page from footer

* Change 'Reformer.Network' to 'Reformer.network'

* Create internal page 'organization.html'

* Refine internal pages

* Translate internal pages

* Change brandings $secondary-color from 'rgb(244, 142, 0)' to 'rgb(239, 123, 0)'

* Change branding $color-primary-active from 'rgb(95, 97, 92)' to 'rgb(135, 135, 135)'

* Move commented font commands in '_branding.scss'

* Set $color-tertiary-light and ribbon colors in '_branding.scss'

* Refactor branding of post ribbons

* Refactor Logos

* Change branding $secondary-color from 'rgb(239, 123, 0)' to 'rgb(239, 124, 0)'

* Refactor colors after the designer suggestions - first step

* Change diverse collorings

- Change border color
- Change plus button
- Change hashtag color
- Change footer link hover
- Change number count color
- Change input border color

* Add font Inter

* Use font Inter

* Make font branding work

* Hover effect for user teaser

* Syncronize 'metadata.ts' with webapp

* Refine e-mail notifications

* Adjust notification settings buttons

* Refine third party setting

* Fix post teaser counter icon tooltips translations

* Refine e-mail notifications

* Refine third party setting

* Add link hover to all internal pages

* Set font family to Inter

- Cleanup

* Set background, color, and font weight of user avatar

---------

Co-authored-by: Maximilian Harz <[email protected]>
@Tirokk Tirokk changed the title 🧘🏼 [Simulation] Do not Merge!!! – Brand reformer network first step 🧘🏼 [Simulation] Do not Merge!!! – Brand reformer network Apr 29, 2025
…anding (#8448)

* Refine locals of some internal pages headlines

* Create page 'legacy information'

* Move filter button into menu

* Refine page 'legacy information'

* Create internal page 'code-of-conduct.html'

* Refine internal page 'code-of-conduct.html'

* Refine page 'legacy information'

* Create internal page 'imprint.html'

* Create internal page 'faq.html'

* Create internal page 'support.html'

* Refine internal page 'faq.html'

* Refine internal page 'imprint.html'

* Move parts of internal page 'data-privacy.html' to 'terms-and-conditions.html'

* Refine internal page 'data-privacy.html'

* Fix tool tip text

* Fix 'email' -> 'e-mail'

* Rename title of organization footer item

- Remove donation page from footer

* Change 'Reformer.Network' to 'Reformer.network'

* Create internal page 'organization.html'

* Refine internal pages

* Translate internal pages

* Change brandings $secondary-color from 'rgb(244, 142, 0)' to 'rgb(239, 123, 0)'

* Change branding $color-primary-active from 'rgb(95, 97, 92)' to 'rgb(135, 135, 135)'

* Move commented font commands in '_branding.scss'

* Set $color-tertiary-light and ribbon colors in '_branding.scss'

* Refactor branding of post ribbons

* Refactor Logos

* Change branding $secondary-color from 'rgb(239, 123, 0)' to 'rgb(239, 124, 0)'

* Refactor colors after the designer suggestions - first step

* Change diverse collorings

- Change border color
- Change plus button
- Change hashtag color
- Change footer link hover
- Change number count color
- Change input border color

* Add font Inter

* Use font Inter

* Make font branding work

* Hover effect for user teaser

* Syncronize 'metadata.ts' with webapp

* Refine e-mail notifications

* Adjust notification settings buttons

* Refine third party setting

* Fix post teaser counter icon tooltips translations

* Refine e-mail notifications

* Refine third party setting

* Add link hover to all internal pages

* Set font family to Inter

- Cleanup

* Set background, color, and font weight of user avatar

* Make login, registration, password-reset layout brandable

- Rename some variables related to this

* Set background images for Login etc.

* Set layout for Login etc. to be 'blank'

* Add login etc. background images

* - first fix for login, registration and password-reset

* - fixed background (including jumping)

* - removing quote block by css
- adding text block by css

* - set font weight

* - added approach also for registration page

* removed registration hack

---------

Co-authored-by: Maximilian Harz <[email protected]>
Co-authored-by: Sebastian Stein <[email protected]>
Co-authored-by: Ulf Gebhardt <[email protected]>
Tirokk added 3 commits April 29, 2025 10:49
…cial into brand-reformer-network-first-step

Conflicts:
	webapp/constants/login.js
	webapp/constants/registration.js
…cial into brand-reformer-network-first-step

# Conflicts:
#	webapp/constants/links.js
#	webapp/locales/de.json
#	webapp/locales/en.json
* Set login to landing page

* Fix _branding.scss

* Remove test code

* Fix login branding

* Fix branding
…cial into brand-reformer-network-first-step

# Conflicts:
#	backend/src/config/logos.ts
#	webapp/constants/logos.js
Tirokk and others added 2 commits May 12, 2025 10:47
* Fix favicon and icon

* - fixed menu item colors
- fixed footer item colors

* - fixed input focus

* - fixed slug color
- fixed primary button hover color

* - fixed chat colors

* - fixed editor button colors

* Add logo-r-circle.svg

* Add new settings in logos.js and logos.ts

* Brand 'categories.*' files

* Add brand categories to locales

* Add 'categories.*' SVGs

* Move categories SVGs to folder 'webapp/assets/_new/icons/svgs'

* Change paths to icon name

* Remove gender language

* Remove '.svg' from icon names and replace underscores by dashes

---------

Co-authored-by: Sebastian Stein <[email protected]>
Tirokk and others added 3 commits May 23, 2025 16:36
* Add new logo 'logo-horizontal.svg'

* Add new logo 'logo-squared.svg'

* Set chat message text to real black
Co-authored-by: Sebastian Stein <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants