ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-security-subscriptions

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-07-20 17:59:30 +02:00 committed by GitHub
commit 26730cd027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/assets/_new/styles/export.scss
View File

@ -31,4 +31,7 @@
chatMessageTimestamp: $chat-message-timestamp;
chatMessageCheckmarkSeen: $chat-message-checkmark-seen;
chatMessageCheckmark: $chat-message-checkmark;
chatRoomBackgroundCounterBadge: $chat-room-background-counter-badge;
chatRoomColorCounterBadge: $chat-room-color-counter-badge;
}

2
webapp/assets/_new/styles/tokens.scss
View File

@ -420,3 +420,5 @@ $chat-new-message-color: $color-secondary-active;
$chat-message-timestamp: $text-color-soft;
$chat-message-checkmark-seen: $text-color-secondary;
$chat-message-checkmark: $text-color-soft;
$chat-room-color-counter-badge: $text-color-inverse;
$chat-room-background-counter-badge: $color-secondary;

4
webapp/constants/chat.js
View File

@ -109,8 +109,8 @@ const STYLE = {
colorTimestamp: '#a2aeb8',
colorStateOnline: '#4caf50',
colorStateOffline: '#9ca6af',
backgroundCounterBadge: '#0696c7',
colorCounterBadge: '#fff',
backgroundCounterBadge: styleData.chatRoomBackgroundCounterBadge,
colorCounterBadge: styleData.chatRoomColorCounterBadge,
},
emoji: {