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

Merge pull request #2510 from ether/chat-users-flow-css

Browse source 
better css
This commit is contained in:
John McLear 2015-02-09 19:47:14 +00:00
commit ac7a5689af
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/static/css/pad.css
View file

@ -897,7 +897,7 @@ input[type=checkbox] {
#connectivity, #connectivity,
#users { #users {
position: absolute; position: absolute;
top: 36px; top: 38px;
right: 20px; right: 20px;
display: none; display: none;
z-index: 500; z-index: 500;
@ -919,7 +919,8 @@ input[type=checkbox] {
right:0px !important; right:0px !important;
border-radius:0px !important; border-radius:0px !important;
width:182px !important; width:182px !important;
margin:2px 0 0 0 !important; /* Below makes UI look weird when X makes editbar flow onto two lines */
/* margin:2px 0 0 0 !important;*/
border: none !important; border: none !important;
border-bottom: 1px solid #ccc !important; border-bottom: 1px solid #ccc !important;
height:155px !important; height:155px !important;
@ -935,9 +936,8 @@ input[type=checkbox] {
.chatAndUsersChat{ .chatAndUsersChat{
bottom:0px !important; bottom:0px !important;
padding:0 !important; padding:0 !important;
margin:0 !important; margin: 165px 0px 0px 0px;
right:0 !important; right:0 !important;
top: 200px !important;
width:182px !important; width:182px !important;
border: none !important; border: none !important;
padding:5px !important; padding:5px !important;

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

@ -57,14 +57,18 @@ var chat = (function()
}, },
chatAndUsers: function(fromInitialCall) chatAndUsers: function(fromInitialCall)
{ {
if(!userAndChat || fromInitialCall){ var toEnable = $('#options-chatandusers').is(":checked");
if(toEnable || !userAndChat || fromInitialCall){
padcookie.setPref("chatAndUsers", true); padcookie.setPref("chatAndUsers", true);
chat.stickToScreen(true); chat.stickToScreen(true);
$('#options-stickychat').prop('checked', true) $('#options-stickychat').prop('checked', true)
$('#options-chatandusers').prop('checked', true)
$('#options-stickychat').prop("disabled", "disabled"); $('#options-stickychat').prop("disabled", "disabled");
$('#users').addClass("chatAndUsers"); $('#users').addClass("chatAndUsers");
$("#chatbox").addClass("chatAndUsersChat"); $("#chatbox").addClass("chatAndUsersChat");
// redraw
userAndChat = true; userAndChat = true;
padeditbar.redrawHeight()
}else{ }else{
padcookie.setPref("chatAndUsers", false); padcookie.setPref("chatAndUsers", false);
$('#options-stickychat').prop("disabled", false); $('#options-stickychat').prop("disabled", false);

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

@ -186,9 +186,20 @@ var padeditbar = (function()
$('#editbar').css("height", editbarHeight); $('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop); $('#editorcontainer').css("top", containerTop);
// make sure pop ups are in the right place
$('.popup').css("top", $('#editorcontainer').offset().top + "px");
// If sticky chat is enabled..
if($('#options-stickychat').is(":checked")){ if($('#options-stickychat').is(":checked")){
$('#chatbox').css("top", $('#editorcontainer').offset().top + "px"); $('#chatbox').css("top", $('#editorcontainer').offset().top + "px");
}; };
// If chat and Users is enabled..
if($('#options-chatandusers').is(":checked")){
$('#users').css("top", $('#editorcontainer').offset().top + "px");
}
}, },
registerDropdownCommand: function (cmd, dropdown) { registerDropdownCommand: function (cmd, dropdown) {
dropdown = dropdown || cmd; dropdown = dropdown || cmd;