118 Commits

Author SHA1 Message Date
Wolfgang Huß
2eca3fbfec
🧘🏼 [Simulation] brand reformer.network – v4 (#8506)
* 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 <sebastian@codepassion.de>
2025-05-12 10:50:11 +02:00
Wolfgang Huß
dea77e8c31 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step
# Conflicts:
#	backend/src/config/logos.ts
#	webapp/constants/logos.js
2025-05-09 19:08:26 +02:00
sebastian2357
ff366a4075
fix(webapp): mobile optimization (#8516)
* - optimized header
- added possibility of extra mobile logo

* - changed behavior of NotificationMenu link get directly open for mobile

* - moved notification links to the top of the menu

* - optimized chat view for mobile

* - added logo branding structure

* - added logo branding structure

* - fixed chat height

* - fixed paddings for internal pages

* Fix linting

* Fix linting

---------

Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2025-05-09 17:04:06 +00:00
Wolfgang Huß
2f67b8cba1
Fix ocelot.social link for imprint and donation (#8461) 2025-04-30 13:28:07 +00:00
Wolfgang Huß
569485bc4c
🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#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 <maxharz@gmail.com>
Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-29 10:21:14 +02:00
Wolfgang Huß
b8141c2e6e
🧘🏼 [Simulation] Brand reformer network first step – v2 (#8384)
* 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 <maxharz@gmail.com>
2025-04-29 10:08:38 +02:00
Wolfgang Huß
48c7bd0033
refactor(webapp): make login, registration, password-reset layout brandable (#8440)
* Make login, registration, password-reset layout brandable

- Rename some variables related to this

* Remove experimental code

* add lodash types

* fix build

fix type

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-28 16:58:35 +00:00
Wolfgang Huß
8d3eb981bc Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step 2025-04-23 11:02:16 +02:00
8cf405c549
feat(backend): badges (#8391)
* delete all old badges

* reward/unrewardBadge

* verification Badges

* name all badged accordingly

* more tests, lint

* seed badges

* profileBadge mechanic

* badgesUnusedCount

* seed profileBadges set

* configure profile badge count

* insert badges db:data:badges:default

* seed commands to seed default badges and allow to seed branding data

* copy data migrations when building docker

* typo

* correct data:branding command & document it

* test new functionality

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* naming coventions

* final naming fix

lint

fix build

fix badge type in test

renamed badge_ to trophy_

lint fixes

small renameing

fixes

fix users spec

fix webapp queries

fix display

* expose badge description

---------

Co-authored-by: Max <maxharz@gmail.com>
2025-04-17 23:08:54 +00:00
Wolfgang Huß
a31274c793
refactor(webapp): refactor branding of post ribbons and chat etc. (#8395)
* Refactor branding of post ribbons

* Refactor chat to be more brandable

* Refine avatar menu logout item to have danger color

* Change login menu item color to '$text-color-link'
2025-04-17 17:48:59 +02:00
Wolfgang Huß
713de2006e Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step 2025-04-12 10:45:07 +02:00
Wolfgang Huß
87e5fc6bf8
feat(webapp): implement configurable custom button in header (#8215)
* Implement configurable custom button in header

* Implement default values for 'headerMenu'

---------

Co-authored-by: mahula <lenzmath@posteo.de>
2025-03-01 08:00:41 +01:00
Wolfgang Huß
73cd9067f5 Adjust colors, extended, third step 2024-10-24 19:30:11 +02:00
Wolfgang Huß
ae4dc66e97 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step
Conflicts:
	webapp/constants/metadata.js
2024-10-24 17:12:52 +02:00
Wolfgang Huß
ca8db76dbf Add explicitly the set SCSS color name to comment 2024-10-24 09:00:44 +02:00
Wolfgang Huß
54489956ff Change solution to make theme color brandable 2024-10-23 15:32:01 +02:00
Wolfgang Huß
7a1616eb8b Merge branch '8003-fix-theme-color-to-be-brandable' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step 2024-10-23 14:56:05 +02:00
Wolfgang Huß
be2ae1394c Fix theme color to be brandable 2024-10-23 14:46:41 +02:00
Wolfgang Huß
942adc09c6 Set first config and branding 2024-10-22 21:38:23 +02:00
Wolfgang Huß
3ea0518457 Revert "Change 'RELATIVE_DATETIME' to 'false'"
This reverts commit c07c0692d5425ab3551614a8b8bc99b2d236a0ae.
2024-02-05 18:52:06 +01:00
Wolfgang Huß
c07c0692d5 Change 'RELATIVE_DATETIME' to 'false' 2024-02-05 17:48:17 +01:00
Wolfgang Huß
4fa8ecf772 Implement config for 'date-time' format 2024-02-05 17:41:44 +01:00
Wolfgang Huß
b6e655ca21 Fix footer links 2024-01-29 11:02:38 +01:00
Wolfgang Huß
9c1d6d7f1f Change group 'DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3', was '50' 2024-01-04 11:48:21 +01:00
elweyn
ad74448696 Fix linting. 2023-07-26 14:00:59 +02:00
elweyn
3e1ed4f1db Change color of scroll icon color & scroll counter color. 2023-07-26 13:37:30 +02:00
elweyn
39eef13a51 Change the ocelot chat room badge color 2023-07-20 16:45:44 +02:00
Wolfgang Huß
db3c625dfb Revert general change of PR 2023-07-20 15:39:11 +02:00
elweyn
2decf90b6b Change the background color of my messages to the same color as the one in side menu. 2023-07-20 13:40:29 +02:00
Markus
897794b0ee [feature] changed seen checks for chat component 2023-07-19 11:06:05 +02:00
Markus
b2976f06eb updated style for chat component 2023-07-12 12:34:12 +02:00
Markus
13b2968c28 added more base design to chat component & lint 2023-07-10 10:49:48 +02:00
Markus
59828c25d2 [feature] added basic custom styling for chat 2023-07-08 16:29:22 +02:00
Moriz Wahl
3dfcf4df9f
Merge pull request #5943 from Ocelot-Social-Community/5907-button-for-writing-new-post-more-to-the-top
refactor(webapp): refacchange postion add content button, refactor mobile filter menu
2023-02-08 16:44:00 +01:00
Moriz Wahl
58c9c84557 min length of group description to 50 2023-02-08 11:51:14 +01:00
ogerly
86f186b30f change postion add content button, refactor mobile filter menu 2023-02-07 12:00:16 +01:00
ogerly
6d9b813549 fix lint 2023-02-03 08:32:32 +01:00
ogerly
f0069c797e add constants filter headermenu and content button 2023-02-03 08:27:41 +01:00
Wolfgang Huß
00c10cc1a7 Refine footer links and donation link and fix their tests 2022-10-28 11:50:15 +02:00
Wolfgang Huß
6c45b1f3a1 Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable 2022-10-28 09:14:08 +02:00
Wolfgang Huß
b43d49bfa9 Make donation progress bar color configurable 2022-10-27 10:07:02 +02:00
ogerly
2ae5e26376 comment out unused menu 2022-10-27 08:51:40 +02:00
ogerly
bad97a2fca fix lint 2022-10-27 08:50:37 +02:00
ogerly
1dfdc61220 footer links target dynamic 2022-10-27 08:48:58 +02:00
ogerly
31a4be9375 add target url dynamic 2022-10-27 08:24:20 +02:00
adrianrojek
a20f1e1bc4
Merge pull request #5579 from Ocelot-Social-Community/bug/issue#5550
feat: 🍰 Header Logo Routing Update
2022-10-26 15:16:38 +02:00
Wolfgang Huß
d9ed2ef2ca Implement that undefined logo click target is '_blank' as default 2022-10-26 11:43:29 +02:00
ar798ax
397b469f62 header logo routing update 2022-10-26 10:14:39 +02:00
Wolfgang Huß
5434bbf6c6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups
# Conflicts:
#	webapp/layouts/default.vue
2022-10-22 12:29:59 +02:00
Moriz Wahl
3fb4146d62 Merge branch 'master' into 5059-epic-groups 2022-10-21 16:58:32 +02:00