fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more styling stuff

This commit is contained in:
John McLear 2015-02-09 18:01:45 +00:00
parent 4af46921e1
commit 8c6507e78c
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/static/css/pad.css
View File

@ -936,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;
width:182px !important; width:182px !important;
border: none !important; border: none !important;
padding:5px !important; padding:5px !important;

3
src/static/js/chat.js
View File

@ -57,7 +57,8 @@ 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)

3
src/static/js/pad_editbar.js
View File

@ -195,9 +195,6 @@ var padeditbar = (function()
// If chat and Users is enabled.. // If chat and Users is enabled..
if($('#options-chatandusers').is(":checked")){ if($('#options-chatandusers').is(":checked")){
$('#users').css("top", $('#editorcontainer').offset().top + "px"); $('#users').css("top", $('#editorcontainer').offset().top + "px");
// We also need to move the chatbox lower..
$('#chatbox').css("top", 10 + $('#users').height() + $('#editorcontainer').offset().top + "px");
} }
}, },