From 71a3579ae73db32b98fa6c97a7f0ce452b555832 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Tue, 7 Apr 2020 09:50:34 +0200
Subject: [PATCH] css: fix broken popup colorpicker chatAndUsers

---
 src/static/css/pad/popup.css                      |  4 ++--
 src/static/css/pad/popup_users.css                |  2 +-
 .../skins/colibris/src/components/users.css       | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/static/css/pad/popup.css b/src/static/css/pad/popup.css
index 8d484eb58..e69dcf5f1 100644
--- a/src/static/css/pad/popup.css
+++ b/src/static/css/pad/popup.css
@@ -1,4 +1,4 @@
-.popup.popup-show {
+.popup.popup-show, .popup#users.chatAndUsers {
   visibility: visible;
 }
 
@@ -8,7 +8,7 @@
   transition: all 0.3s cubic-bezier(0.74, -0.05, 0.27, 1.75)
 }
 
-.popup.popup-show > .popup-content {
+.popup.popup-show > .popup-content, .popup#users.chatAndUsers > .popup-content {
   transform: scale(1);
   opacity: 1;
 }
diff --git a/src/static/css/pad/popup_users.css b/src/static/css/pad/popup_users.css
index 66ba07e9b..957a44c71 100644
--- a/src/static/css/pad/popup_users.css
+++ b/src/static/css/pad/popup_users.css
@@ -24,7 +24,7 @@
   right: 0;
   left: auto;
 }
-.popup#users.chatAndUsers .popup-content {
+.popup#users.chatAndUsers > .popup-content {
   border: none;
   border-bottom: 1px solid #ccc;
   border-left: 1px solid #ccc;
diff --git a/src/static/skins/colibris/src/components/users.css b/src/static/skins/colibris/src/components/users.css
index 62010223e..35d77a95a 100644
--- a/src/static/skins/colibris/src/components/users.css
+++ b/src/static/skins/colibris/src/components/users.css
@@ -2,14 +2,23 @@ table#otheruserstable {
   margin-top: 20px;
 }
 
-.popup#users.chatAndUsers .popup-content {
+.popup#users.chatAndUsers > .popup-content {
   padding: 20px 10px;
   height: 250px;
-  background-color: white;
-  color: #374256;
   border-left: none;
   transition: none;
 }
+.popup#users.chatAndUsers .popup-content {
+  background-color: white;
+  color: #374256;
+}
+.popup#users.chatAndUsers #mycolorpicker.popup {
+  right: calc(100% + 30px);
+  top: 15px;
+}
+.popup#users.chatAndUsers #mycolorpicker.popup .btn-default {
+  color: #374256;
+}
 
 #otheruserstable .swatch {
   border: none !important;