From 39eef13a51a561b3a015e8502ea6cc1bb80ce174 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 20 Jul 2023 16:45:44 +0200 Subject: [PATCH] Change the ocelot chat room badge color --- webapp/assets/_new/styles/export.scss | 3 +++ webapp/assets/_new/styles/tokens.scss | 2 ++ webapp/assets/styles/imports/_branding.scss | 7 ++----- webapp/constants/chat.js | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/webapp/assets/_new/styles/export.scss b/webapp/assets/_new/styles/export.scss index 5b866d6b7..e29c014e2 100644 --- a/webapp/assets/_new/styles/export.scss +++ b/webapp/assets/_new/styles/export.scss @@ -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; } \ No newline at end of file diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index ef5086240..3e189abf2 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -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: $color-primary; +$chat-room-background-counter-badge: $color-secondary; diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index 1bb4291af..733f2856c 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -28,13 +28,10 @@ $color-toast-blue: rgb(0, 142, 230); $color-toast-green: $color-primary; $chat-message-bg-me: $color-primary-light; -// $chat-message-color: $text-color-base; -// $chat-message-bg-others: $color-neutral-80; -// $chat-sidemenu-bg: $color-secondary-active; -// $chat-new-message-color: $color-secondary-active; -// $chat-message-timestamp: $text-color-soft; $chat-message-checkmark-seen: $color-secondary; $chat-message-checkmark: $text-color-inverse; +$chat-room-color-counter-badge: $color-primary; +$chat-room-background-counter-badge: $color-secondary; .main-navigation a { diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js index 181d88e0e..de391707d 100644 --- a/webapp/constants/chat.js +++ b/webapp/constants/chat.js @@ -109,8 +109,8 @@ const STYLE = { colorTimestamp: '#a2aeb8', colorStateOnline: '#4caf50', colorStateOffline: '#9ca6af', - backgroundCounterBadge: '#0696c7', - colorCounterBadge: '#fff', + backgroundCounterBadge: styleData.chatRoomBackgroundCounterBadge, + colorCounterBadge: styleData.chatRoomColorCounterBadge, }, emoji: {