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 6236-groups-highlighting

Browse Source
This commit is contained in:
Markus 2023-07-19 21:59:05 +02:00
commit 2286d91d50
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,4 +27,8 @@
chatMessageBgOthers: $chat-message-bg-others; chatMessageBgOthers: $chat-message-bg-others;
chatNewMessageColor: $chat-new-message-color; chatNewMessageColor: $chat-new-message-color;
chatMessageTimestamp: $chat-message-timestamp;
chatMessageCheckmarkSeen: $chat-message-checkmark-seen;
chatMessageCheckmark: $chat-message-checkmark;
} }

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

@ -417,3 +417,6 @@ $chat-message-color: $text-color-base;
$chat-message-bg-others: $color-neutral-80; $chat-message-bg-others: $color-neutral-80;
$chat-sidemenu-bg: $color-secondary-active; $chat-sidemenu-bg: $color-secondary-active;
$chat-new-message-color: $color-secondary-active; $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;

6
webapp/constants/chat.js
View File

@ -65,7 +65,7 @@ const STYLE = {
backgroundSelected: '#c2dcf2', backgroundSelected: '#c2dcf2',
colorDeleted: '#757e85', colorDeleted: '#757e85',
colorUsername: '#9ca6af', colorUsername: '#9ca6af',
colorTimestamp: '#828c94', colorTimestamp: styleData.chatMessageTimestamp,
backgroundDate: '#e5effa', backgroundDate: '#e5effa',
colorDate: '#505a62', colorDate: '#505a62',
backgroundSystem: '#e5effa', backgroundSystem: '#e5effa',
@ -134,8 +134,8 @@ const STYLE = {
emojiReaction: 'rgba(0, 0, 0, 0.3)', emojiReaction: 'rgba(0, 0, 0, 0.3)',
document: styleData.colorPrimary, document: styleData.colorPrimary,
pencil: '#9e9e9e', pencil: '#9e9e9e',
checkmark: '#9e9e9e', checkmark: styleData.chatMessageCheckmark,
checkmarkSeen: '#0696c7', checkmarkSeen: styleData.chatMessageCheckmarkSeen,
eye: '#fff', eye: '#fff',
dropdownMessage: '#fff', dropdownMessage: '#fff',
dropdownMessageBackground: 'rgba(0, 0, 0, 0.25)', dropdownMessageBackground: 'rgba(0, 0, 0, 0.25)',