mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

css: fix popup broken by new animation

Browse source 
fix connectivity
fix chat and users
This commit is contained in:
Sebastian Castro 2020-04-06 19:30:51 +02:00 • committed by muxator
parent 9b60bb4d55
commit 9497db89c9
5 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/static/css/pad/popup_connectivity.css
View file

@ -1,8 +1,4 @@
#connectivity { #connectivity .popup-content * {
z-index: 600 !important;
}
#connectivity * {
display: none; display: none;
} }

2
src/static/css/pad/popup_users.css
View file

@ -23,6 +23,8 @@
top: 0; top: 0;
right: 0; right: 0;
left: auto; left: auto;
}
.popup#users.chatAndUsers .popup-content {
border: none; border: none;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;

2
src/static/js/chat.js
View file

@ -66,7 +66,7 @@ var chat = (function()
userAndChat = false; userAndChat = false;
} }
padcookie.setPref("chatAndUsers", userAndChat); padcookie.setPref("chatAndUsers", userAndChat);
$('#users, .sticky-container').toggleClass("chatAndUsers stickyUsers", userAndChat); $('#users, .sticky-container').toggleClass("chatAndUsers popup-show stickyUsers", userAndChat);
$("#chatbox").toggleClass("chatAndUsersChat", userAndChat); $("#chatbox").toggleClass("chatAndUsersChat", userAndChat);
}, },
hide: function () hide: function ()

6
src/static/js/pad_editbar.js
View file

@ -253,8 +253,10 @@ var padeditbar = (function()
else if(thisModuleName==moduleName) else if(thisModuleName==moduleName)
{ {
$("li[data-key=" + thisModuleName + "] > a").addClass("selected"); $("li[data-key=" + thisModuleName + "] > a").addClass("selected");
module.addClass("popup-show") module.addClass("popup-show");
cb(); if (cb) {
cb();
}
} }
} }
} }

10
src/static/skins/colibris/src/components/users.css
View file

@ -2,6 +2,15 @@ table#otheruserstable {
margin-top: 20px; 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 { #otheruserstable .swatch {
border: none !important; border: none !important;
border-radius: 50%; border-radius: 50%;
@ -19,6 +28,7 @@ table#otheruserstable {
input#myusernameedit { input#myusernameedit {
min-width: 110px; min-width: 110px;
border: none !important; border: none !important;
background-color: transparent !important;
border-bottom: 1px solid #ddd !important; border-bottom: 1px solid #ddd !important;
border-radius: 0; border-radius: 0;
padding-bottom: 5px; padding-bottom: 5px;