From 9497db89c96a0ebf84f68c86941847ad5e174c94 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Mon, 6 Apr 2020 19:30:51 +0200
Subject: [PATCH] css: fix popup broken by new animation

fix connectivity
fix chat and users
---
 src/static/css/pad/popup_connectivity.css          |  6 +-----
 src/static/css/pad/popup_users.css                 |  2 ++
 src/static/js/chat.js                              |  2 +-
 src/static/js/pad_editbar.js                       |  6 ++++--
 src/static/skins/colibris/src/components/users.css | 10 ++++++++++
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/static/css/pad/popup_connectivity.css b/src/static/css/pad/popup_connectivity.css
index d0196ec42..809233413 100644
--- a/src/static/css/pad/popup_connectivity.css
+++ b/src/static/css/pad/popup_connectivity.css
@@ -1,8 +1,4 @@
-#connectivity {
-  z-index: 600 !important;
-}
-
-#connectivity * {
+#connectivity .popup-content * {
   display: none;
 }
 
diff --git a/src/static/css/pad/popup_users.css b/src/static/css/pad/popup_users.css
index 01a57d4fa..66ba07e9b 100644
--- a/src/static/css/pad/popup_users.css
+++ b/src/static/css/pad/popup_users.css
@@ -23,6 +23,8 @@
   top: 0;
   right: 0;
   left: auto;
+}
+.popup#users.chatAndUsers .popup-content {
   border: none;
   border-bottom: 1px solid #ccc;
   border-left: 1px solid #ccc;
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 1309691ed..34b101cd1 100755
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -66,7 +66,7 @@ var chat = (function()
         userAndChat = false;
       }
       padcookie.setPref("chatAndUsers", userAndChat);
-      $('#users, .sticky-container').toggleClass("chatAndUsers stickyUsers", userAndChat);
+      $('#users, .sticky-container').toggleClass("chatAndUsers popup-show stickyUsers", userAndChat);
       $("#chatbox").toggleClass("chatAndUsersChat", userAndChat);
     },
     hide: function ()
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 8a1d84237..21e2d4f87 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -253,8 +253,10 @@ var padeditbar = (function()
           else if(thisModuleName==moduleName)
           {
             $("li[data-key=" + thisModuleName + "] > a").addClass("selected");
-            module.addClass("popup-show")
-            cb();
+            module.addClass("popup-show");
+            if (cb) {
+              cb();
+            }
           }
         }
       }
diff --git a/src/static/skins/colibris/src/components/users.css b/src/static/skins/colibris/src/components/users.css
index 23c00379d..62010223e 100644
--- a/src/static/skins/colibris/src/components/users.css
+++ b/src/static/skins/colibris/src/components/users.css
@@ -2,6 +2,15 @@ table#otheruserstable {
   margin-top: 20px;
 }
 
+.popup#users.chatAndUsers .popup-content {
+  padding: 20px 10px;
+  height: 250px;
+  background-color: white;
+  color: #374256;
+  border-left: none;
+  transition: none;
+}
+
 #otheruserstable .swatch {
   border: none !important;
   border-radius: 50%;
@@ -19,6 +28,7 @@ table#otheruserstable {
 input#myusernameedit {
   min-width: 110px;
   border: none !important;
+  background-color: transparent !important;
   border-bottom: 1px solid #ddd !important;
   border-radius: 0;
   padding-bottom: 5px;