From c03ce6fdf7aafacb27a31660f86ce6abd507f326 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 13 Dec 2017 13:21:42 +0000 Subject: [PATCH] Configure chat messages colors per brand. --- .../coffee/infrastructure/ExpressLocals.coffee | 8 ++++---- .../controllers/ChatMessageController.coffee | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index 51e1209cdc..9b7e9197b4 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -302,8 +302,8 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)-> westResizerCursor : if isOl then "ew-resize" else null chatResizerSizeOpen : if isOl then 2 else 12 chatResizerSizeClosed : 0 - chatMessageBorderSaturation: if isOl then 90 else 70 - chatMessageBorderLightness : if isOl then 50 else 70 - chatMessageBgSaturation : if isOl then 90 else 60 - chatMessageBgLightness : if isOl then 50 else 97 + chatMessageBorderSaturation: if isOl then "90%" else "70%" + chatMessageBorderLightness : if isOl then "50%" else "70%" + chatMessageBgSaturation : if isOl then "90%" else "60%" + chatMessageBgLightness : if isOl then "50%" else "97%" next() diff --git a/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee b/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee index 302aa1fd94..f69e04cad2 100644 --- a/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee +++ b/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee @@ -3,6 +3,12 @@ define [ "ide/colors/ColorManager" ], (App, ColorManager) -> App.controller "ChatMessageController", ["$scope", "ide", ($scope, ide) -> + hslColorConfigs = + borderSaturation: window.uiConfig?.chatMessageBorderSaturation or "70%" + borderLightness : window.uiConfig?.chatMessageBorderLightness or "70%" + bgSaturation : window.uiConfig?.chatMessageBgSaturation or "60%" + bgLightness : window.uiConfig?.chatMessageBgLightness or "97%" + hue = (user) -> if !user? return 0 @@ -10,9 +16,15 @@ define [ return ColorManager.getHueForUserId(user.id) $scope.getMessageStyle = (user) -> - "border-color" : "hsl(#{ hue(user) }, 70%, 70%)" - "background-color" : "hsl(#{ hue(user) }, 60%, 97%)" + style = + "border-color" : "hsl(#{ hue(user) }, #{ hslColorConfigs.borderSaturation }, #{ hslColorConfigs.borderLightness })" + "background-color" : "hsl(#{ hue(user) }, #{ hslColorConfigs.bgSaturation }, #{ hslColorConfigs.bgLightness })" + console.log style + return style $scope.getArrowStyle = (user) -> - "border-color" : "hsl(#{ hue(user) }, 70%, 70%)" + style = + "border-color" : "hsl(#{ hue(user) }, #{ hslColorConfigs.borderSaturation }, #{ hslColorConfigs.borderLightness })" + console.log style + return style ] \ No newline at end of file