From 219387529272c1a5a08f95ad3a41beb6785170d1 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Thu, 16 Apr 2020 08:20:57 +0200
Subject: [PATCH] colibris: fix coloring text when authorship background color
 is activated #3641

---
 src/static/js/ace2_inner.js                          | 12 +++---------
 src/static/js/colorutils.js                          |  8 ++++++++
 src/static/skins/colibris/src/components/toolbar.css |  2 --
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index dc2b72325..be7376978 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -255,15 +255,9 @@ function Ace2Inner(){
         authorStyle.backgroundColor = bgcolor;
         parentAuthorStyle.backgroundColor = bgcolor;
 
-        // text contrast
-        if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.5)
-        {
-          authorStyle.color = '#ffffff';
-          parentAuthorStyle.color = '#ffffff';
-        }else{
-          authorStyle.color = null;
-          parentAuthorStyle.color = null;
-        }
+        var textColor = colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName);
+        authorStyle.color = textColor;
+        parentAuthorStyle.color = textColor;
 
         // anchor text contrast
         if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.55)
diff --git a/src/static/js/colorutils.js b/src/static/js/colorutils.js
index af471c453..3faaebd3a 100644
--- a/src/static/js/colorutils.js
+++ b/src/static/js/colorutils.js
@@ -142,4 +142,12 @@ colorutils.complementary = function(c)
   ];
 }
 
+colorutils.textColorFromBackgroundColor = function(bgcolor, skinName)
+{
+  var white = skinName == 'colibris' ? 'var(--super-light-color)' : '#fff';
+  var black = skinName == 'colibris' ? 'var(--super-dark-color)' : '#222';
+
+  return colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.5 ? white : black;
+}
+
 exports.colorutils = colorutils;
diff --git a/src/static/skins/colibris/src/components/toolbar.css b/src/static/skins/colibris/src/components/toolbar.css
index dc4a0fc18..204979c50 100644
--- a/src/static/skins/colibris/src/components/toolbar.css
+++ b/src/static/skins/colibris/src/components/toolbar.css
@@ -84,8 +84,6 @@
   margin-left: 15px;
   width: 45px;
   height: 100%;
-  background-color: var(--bg-color);
-  color: var(--text-color);
 }
 .toolbar ul li[data-key=showusers] > a {
   width: 100%;