-
Notifications
You must be signed in to change notification settings - Fork 41
π§πΌ [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
Tirokk
wants to merge
30
commits into
master
Choose a base branch
from
brand-reformer-network-first-step
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
β¦lot-Social-Community/Ocelot-Social into brand-reformer-network-first-step
β¦cial into brand-reformer-network-first-step Conflicts: webapp/constants/metadata.js
β¦cial into brand-reformer-network-first-step
β¦-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
β¦cial into brand-reformer-network-first-step
β¦cial into brand-reformer-network-first-step
60 tasks
β¦cial into brand-reformer-network-first-step
* 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]>
β¦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]>
93 tasks
β¦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
95 tasks
β¦cial into brand-reformer-network-first-step # Conflicts: # backend/src/config/logos.ts # webapp/constants/logos.js
β¦cial into brand-reformer-network-first-step
* 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]>
99 tasks
* Add new logo 'logo-horizontal.svg' * Add new logo 'logo-squared.svg' * Set chat message text to real black
β¦cial into brand-reformer-network-first-step
99 tasks
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Todo